Changeset 6810

Timestamp:

05/22/07 19:17:43 (1 year ago)

Author:

xal

Message:

Rescuing in around_filters works as expected again [codahale, Stephan Kaes]. Closes #8341

Files:

• trunk/actionpack/lib/action_controller/filters.rb (modified) (1 diff)
• trunk/actionpack/test/controller/filters_test.rb (modified) (2 diffs)

trunk/actionpack/lib/action_controller/filters.rb

@@ -714 +714 @@
-        return index if aborted || nesting != 0
-
+        # if an around filter catches an exception during rendering and handles it, e.g.
+        # by rendering an error page, we might have left over around filters in the filter
+        # chain. so skip over these.
+        index = index.next while (filter = chain[index]) && filter.type == :around
+
-        # run after filters, if any
-        while chain[index]

trunk/actionpack/test/controller/filters_test.rb

@@ -323 +323 @@
-    def show
-      render :text => 'hello'
+    end
+  end
+  
+  class ErrorToRescue < Exception; end
+  
+  class RescuingAroundFilterWithBlock
+    def filter(controller)
+      begin
+        yield
+      rescue ErrorToRescue => ex
+        controller.send :render, :text => "I rescued this: #{ex.inspect}"
+      end
+    end
+  end
+  
+  class RescuedController < ActionController::Base
+    around_filter RescuingAroundFilterWithBlock.new
+    
+    def show
+      raise ErrorToRescue.new("Something made the bad noise.")
+    end
+    
+  private
+    def rescue_action(exception)
+      raise exception
-    end
-  end
@@ -491 +516 @@
-  def test_changing_the_requirements
-    assert_equal nil, test_process(ChangingTheRequirementsController, "go_wild").template.assigns['ran_filter']
+  end
+  
+  def test_a_rescuing_around_filter
+    response = nil
+    assert_nothing_raised do
+      response = test_process(RescuedController)
+    end
+    
+    assert response.success?
+    assert_equal("I rescued this: #<FilterTest::ErrorToRescue: Something made the bad noise.>", response.body)
-  end
-