diff options
author | José Valim <jose.valim@gmail.com> | 2011-12-03 11:38:25 +0100 |
---|---|---|
committer | José Valim <jose.valim@gmail.com> | 2011-12-03 11:38:25 +0100 |
commit | 2ab2077235308aaa82dc430f1da8d6519fb7dac0 (patch) | |
tree | 05ec14d70283ffd4b342b9ef155849666d50609a /actionpack/lib/action_dispatch | |
parent | 0e17cf17ebeb70490d7c7cd25c6bf8f9401e44b3 (diff) | |
download | rails-2ab2077235308aaa82dc430f1da8d6519fb7dac0.tar.gz rails-2ab2077235308aaa82dc430f1da8d6519fb7dac0.tar.bz2 rails-2ab2077235308aaa82dc430f1da8d6519fb7dac0.zip |
Fix failing cascade exception.
Diffstat (limited to 'actionpack/lib/action_dispatch')
-rw-r--r-- | actionpack/lib/action_dispatch/middleware/debug_exceptions.rb | 3 | ||||
-rw-r--r-- | actionpack/lib/action_dispatch/middleware/show_exceptions.rb | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/actionpack/lib/action_dispatch/middleware/debug_exceptions.rb b/actionpack/lib/action_dispatch/middleware/debug_exceptions.rb index 5da21ddd3d..417701ea54 100644 --- a/actionpack/lib/action_dispatch/middleware/debug_exceptions.rb +++ b/actionpack/lib/action_dispatch/middleware/debug_exceptions.rb @@ -15,6 +15,7 @@ module ActionDispatch begin response = @app.call(env) + # TODO: Maybe this should be in the router itself if response[1]['X-Cascade'] == 'pass' raise ActionController::RoutingError, "No route matches [#{env['REQUEST_METHOD']}] #{env['PATH_INFO'].inspect}" end @@ -22,7 +23,7 @@ module ActionDispatch raise exception if env['action_dispatch.show_exceptions'] == false end - response ? response : render_exception(env, exception) + exception ? render_exception(env, exception) : response end private diff --git a/actionpack/lib/action_dispatch/middleware/show_exceptions.rb b/actionpack/lib/action_dispatch/middleware/show_exceptions.rb index 9efe90a670..0c95248611 100644 --- a/actionpack/lib/action_dispatch/middleware/show_exceptions.rb +++ b/actionpack/lib/action_dispatch/middleware/show_exceptions.rb @@ -40,7 +40,7 @@ module ActionDispatch raise exception if env['action_dispatch.show_exceptions'] == false end - response ? response : render_exception_with_failsafe(env, exception) + response || render_exception_with_failsafe(env, exception) end private |