Changeset 7618

Timestamp:

09/24/07 19:56:11 (1 year ago)

Author:

bitsweat

Message:

Move rescue_action_with_handler from rescue_action to perform_action so it isn't clobbered by test overrides. References #9449, closes #9645.

Files:

• trunk/actionpack/lib/action_controller/rescue.rb (modified) (2 diffs)

trunk/actionpack/lib/action_controller/rescue.rb

@@ -90 +90 @@
-        erase_results if performed?
-
-        return if rescue_action_with_handler(exception)
-
-        # Let the exception alter the response if it wants.
-        # For example, MethodNotAllowed sets the Allow header.
@@ -177 +175 @@
-        perform_action_without_rescue
-      rescue Exception => exception  # errors from action performed
+        return if rescue_action_with_handler(exception)
+        
-        rescue_action(exception)
-      end