diff options
| author | Carlos Antonio da Silva <carlosantoniodasilva@gmail.com> | 2012-11-04 19:50:56 -0200 |
|---|---|---|
| committer | Carlos Antonio da Silva <carlosantoniodasilva@gmail.com> | 2012-11-04 19:50:56 -0200 |
| commit | 7fb536972e6b861c7a7714ef22d5e9b9527d8be0 (patch) | |
| tree | fdabc7cb342e3a87174ad974ef27eeb231b705b8 /actionpack | |
| parent | 1fef1bedbcb8bc8fe1930a6dc2ad5c9a3c1efe1e (diff) | |
| download | rails-7fb536972e6b861c7a7714ef22d5e9b9527d8be0.tar.gz rails-7fb536972e6b861c7a7714ef22d5e9b9527d8be0.tar.bz2 rails-7fb536972e6b861c7a7714ef22d5e9b9527d8be0.zip | |
Add ensure block to make sure the state is properly restored
Diffstat (limited to 'actionpack')
| -rw-r--r-- | actionpack/lib/action_dispatch/middleware/show_exceptions.rb | 2 | ||||
| -rw-r--r-- | actionpack/test/controller/show_exceptions_test.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/lib/action_dispatch/middleware/show_exceptions.rb b/actionpack/lib/action_dispatch/middleware/show_exceptions.rb index 0de10695e0..2b37a8d026 100644 --- a/actionpack/lib/action_dispatch/middleware/show_exceptions.rb +++ b/actionpack/lib/action_dispatch/middleware/show_exceptions.rb @@ -28,7 +28,7 @@ module ActionDispatch def call(env) begin - response = @app.call(env) + response = @app.call(env) rescue Exception => exception raise exception if env['action_dispatch.show_exceptions'] == false end diff --git a/actionpack/test/controller/show_exceptions_test.rb b/actionpack/test/controller/show_exceptions_test.rb index ab1bd0e3b6..718d06ef38 100644 --- a/actionpack/test/controller/show_exceptions_test.rb +++ b/actionpack/test/controller/show_exceptions_test.rb @@ -104,7 +104,7 @@ module ShowExceptions get '/', {}, 'HTTP_ACCEPT' => 'text/json' assert_response :internal_server_error assert_equal 'text/plain', response.content_type.to_s - + ensure @app.instance_variable_set(:@exceptions_app, @exceptions_app) $stderr = STDERR end |