From 3ded9b3c26e7fc2684ba1200ae9263d821408545 Mon Sep 17 00:00:00 2001 From: Sergey Nartimov Date: Mon, 16 Jan 2012 14:35:44 +0300 Subject: use Rack::BodyProxy in AD::Reloader --- actionpack/lib/action_dispatch/middleware/reloader.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'actionpack/lib/action_dispatch/middleware/reloader.rb') diff --git a/actionpack/lib/action_dispatch/middleware/reloader.rb b/actionpack/lib/action_dispatch/middleware/reloader.rb index 7a5aff214d..a0388e0e13 100644 --- a/actionpack/lib/action_dispatch/middleware/reloader.rb +++ b/actionpack/lib/action_dispatch/middleware/reloader.rb @@ -1,5 +1,3 @@ -require 'action_dispatch/middleware/body_proxy' - module ActionDispatch # ActionDispatch::Reloader provides prepare and cleanup callbacks, # intended to assist with code reloading during development. @@ -62,8 +60,10 @@ module ActionDispatch def call(env) @validated = @condition.call prepare! + response = @app.call(env) - response[2] = ActionDispatch::BodyProxy.new(response[2]) { cleanup! } + response[2] = ::Rack::BodyProxy.new(response[2]) { cleanup! } + response rescue Exception cleanup! -- cgit v1.2.3