From ecf7ebf2d9adc15be69c7ed3065b5332c333000e Mon Sep 17 00:00:00 2001 From: Josh Zucker Date: Tue, 7 Jan 2025 12:45:54 -0500 Subject: [PATCH] Don't special case IsolatedExecutionState.clear --- actionpack/lib/action_controller/metal/live.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/actionpack/lib/action_controller/metal/live.rb b/actionpack/lib/action_controller/metal/live.rb index 6af8787072e61..23cd5d87fe4a4 100644 --- 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