Simpler rescue_action condition

rails · May 12, 2008 · cde6a25 · cde6a25
1 parent f2e4bf2
commit cde6a25
Showing 1 changed file with 2 additions and 4 deletions.
diff --git a/actionpack/lib/action_controller/rescue.rb b/actionpack/lib/action_controller/rescue.rb
@@ -199,10 +199,8 @@ def rescue_action_with_handler(exception)
     private
       def perform_action_with_rescue #:nodoc:
         perform_action_without_rescue
-      rescue Exception => exception  # errors from action performed
-        return if rescue_action_with_handler(exception)
-
-        rescue_action(exception)
+      rescue Exception => exception
+        rescue_action_with_handler(exception) || rescue_action(exception)
       end
 
       def rescues_path(template_name)