Don't special case IsolatedExecutionState.clear

Shopify · Jan 7, 2025 · ecf7ebf · ecf7ebf
1 parent 56fff14
commit ecf7ebf
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/actionpack/lib/action_controller/metal/live.rb b/actionpack/lib/action_controller/metal/live.rb
@@ -301,6 +301,7 @@ def process(name)
               error = e
             end
           ensure
+            ActiveSupport::IsolatedExecutionState.clear
             clean_up_thread_locals(locals, t2)
 
             @_response.commit!
@@ -377,7 +378,6 @@ def new_controller_thread # :nodoc:
 
       # Ensure we clean up any thread locals we copied so that the thread can reused.
       def clean_up_thread_locals(locals, thread) # :nodoc:
-        ActiveSupport::IsolatedExecutionState.clear
         locals.each { |k, _| thread[k] = nil }
       end