Disregard expire methods when the controller hasnt been set, which essentially makes it such that the record observer callbacks are ignored when the sweeper shouldnt be active

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@1242 5ecf4fe2-1ee6-0310-87b1-e25e094e27de

1 files changed, 1 insertions, 0 deletions

diff --git a/actionpack/lib/action_controller/caching.rb b/actionpack/lib/action_controller/caching.rb
index b6861cb081..0254c2d98d 100644
--- a/actionpack/lib/action_controller/caching.rb
+++ b/actionpack/lib/action_controller/caching.rb
@@ -469,6 +469,7 @@ module ActionController #:nodoc:
           end
         
           def method_missing(method, *arguments)
+            return if @controller.nil?
             @controller.send(method, *arguments)
           end
       end