diff options
| author | Xavier Noria <fxn@hashref.com> | 2010-12-24 01:55:35 +0100 |
|---|---|---|
| committer | Xavier Noria <fxn@hashref.com> | 2010-12-24 01:55:35 +0100 |
| commit | 8cdb75808198bf579e14d0fcdd1d2a51b3233add (patch) | |
| tree | 9bf4bb54e4175bc805d407e2b5e3bc42bf1d0dd8 /actionpack/lib/action_dispatch/middleware/reloader.rb | |
| parent | 3822673151cd0f53e0e4e671988e35603bf2901c (diff) | |
| parent | 6974c595fd480dc0ae3311ef60920fa87c5ff9d0 (diff) | |
| download | rails-8cdb75808198bf579e14d0fcdd1d2a51b3233add.tar.gz rails-8cdb75808198bf579e14d0fcdd1d2a51b3233add.tar.bz2 rails-8cdb75808198bf579e14d0fcdd1d2a51b3233add.zip | |
Merge branch 'master' of github.com:rails/rails
Diffstat (limited to 'actionpack/lib/action_dispatch/middleware/reloader.rb')
| -rw-r--r-- | actionpack/lib/action_dispatch/middleware/reloader.rb | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/actionpack/lib/action_dispatch/middleware/reloader.rb b/actionpack/lib/action_dispatch/middleware/reloader.rb index 7624a1871a..f6ab368ad8 100644 --- a/actionpack/lib/action_dispatch/middleware/reloader.rb +++ b/actionpack/lib/action_dispatch/middleware/reloader.rb @@ -68,6 +68,9 @@ module ActionDispatch response = @app.call(env) response[2].extend(CleanupOnClose) response + rescue Exception + _run_cleanup_callbacks + raise end end end |