Don't run the action if callbacks are halted.

  In AbstractController, this means that response_body is not empty

2 files changed, 12 insertions, 4 deletions

diff --git a/activesupport/lib/active_support/new_callbacks.rb b/activesupport/lib/active_support/new_callbacks.rb
index 2ae7b006c7..9316d6d2b6 100644
--- a/activesupport/lib/active_support/new_callbacks.rb
+++ b/activesupport/lib/active_support/new_callbacks.rb
@@ -316,7 +316,7 @@ module ActiveSupport
         each do |callback|
           method << callback.start(key, options)
         end
-        method << "yield self if block_given?"
+        method << "yield self if block_given? && !halted"
         reverse_each do |callback|
           method << callback.end(key, options)
         end
diff --git a/activesupport/test/new_callbacks_test.rb b/activesupport/test/new_callbacks_test.rb
index 8c887e1bf1..dec6106ac1 100644
--- a/activesupport/test/new_callbacks_test.rb
+++ b/activesupport/test/new_callbacks_test.rb
@@ -365,7 +365,7 @@ module NewCallbacksTest
     save_callback :after, :third
 
   
-    attr_reader :history
+    attr_reader :history, :saved
     def initialize
       @history = []
     end
@@ -390,7 +390,9 @@ module NewCallbacksTest
     end
   
     def save
-      _run_save_callbacks
+      _run_save_callbacks do
+        @saved = true
+      end
     end
   end
 
@@ -400,6 +402,12 @@ module NewCallbacksTest
       terminator.save
       assert_equal ["first", "second", "third", "second", "first"], terminator.history
     end
+    
+    def test_block_never_called_if_terminated
+      obj = CallbackTerminator.new
+      obj.save
+      assert !obj.saved
+    end    
   end
   
   class HyphenatedKeyTest < Test::Unit::TestCase
@@ -407,6 +415,6 @@ module NewCallbacksTest
       obj = HyphenatedCallbacks.new
       obj.save
       assert_equal obj.stuff, "OMG"
-    end
+    end    
   end  
 end