Merge pull request #8798 from goshakkk/show-exceptions-begin-rescue

Refactor ShowExceptions' #call to use def-rescue instead of begin-rescue

1 files changed, 4 insertions, 7 deletions

diff --git a/actionpack/lib/action_dispatch/middleware/show_exceptions.rb b/actionpack/lib/action_dispatch/middleware/show_exceptions.rb
index 07ecf9702e..fcc5bc12c4 100644
--- a/actionpack/lib/action_dispatch/middleware/show_exceptions.rb
+++ b/actionpack/lib/action_dispatch/middleware/show_exceptions.rb
@@ -27,13 +27,10 @@ module ActionDispatch
     end
 
     def call(env)
-      begin
-        response = @app.call(env)
-      rescue Exception => exception
-        raise exception if env['action_dispatch.show_exceptions'] == false
-      end
-
-      response || render_exception(env, exception)
+      @app.call(env)
+    rescue Exception => exception
+      raise exception if env['action_dispatch.show_exceptions'] == false
+      render_exception(env, exception)
     end
 
     private