aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortank-bohr <tank_bohr@mail.ru>2013-01-07 01:19:06 +0400
committerAlexey Nikitin <xoma@xoma-eeepc.(none)>2013-01-07 02:00:40 +0400
commit8f18550b0acbcdc918bbfbf8c8f2f7521cbac0d5 (patch)
treec84bf4c31959d3ddeb95a4890e2ba9ac9413e2ea
parent85afc11756630eb8d4bdc302ea026834251ffc8a (diff)
downloadrails-8f18550b0acbcdc918bbfbf8c8f2f7521cbac0d5.tar.gz
rails-8f18550b0acbcdc918bbfbf8c8f2f7521cbac0d5.tar.bz2
rails-8f18550b0acbcdc918bbfbf8c8f2f7521cbac0d5.zip
fix for rbx
Rubinius returns a boolean after such assingment response = (_, headers, body = @app.call(env)) see https://github.com/rubinius/rubinius/issues/2117 get rid of a local variable
-rw-r--r--actionpack/lib/action_dispatch/middleware/debug_exceptions.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/lib/action_dispatch/middleware/debug_exceptions.rb b/actionpack/lib/action_dispatch/middleware/debug_exceptions.rb
index 6bc5876b6c..3f1cf14825 100644
--- a/actionpack/lib/action_dispatch/middleware/debug_exceptions.rb
+++ b/actionpack/lib/action_dispatch/middleware/debug_exceptions.rb
@@ -15,7 +15,7 @@ module ActionDispatch
def call(env)
begin
- response = (_, headers, body = @app.call(env))
+ status, headers, body = @app.call(env)
if headers['X-Cascade'] == 'pass'
body.close if body.respond_to?(:close)
@@ -25,7 +25,7 @@ module ActionDispatch
raise exception if env['action_dispatch.show_exceptions'] == false
end
- exception ? render_exception(env, exception) : response
+ exception ? render_exception(env, exception) : [status, headers, body]
end
private