From b4b0fddb24b0e6cbff6936606689984274cecd15 Mon Sep 17 00:00:00 2001
From: Levente Bagi <levente@picklive.com>
Date: Tue, 6 Mar 2012 16:24:04 +0000
Subject: Don't ignore call to undefined method in Sweeper

---
 actionpack/lib/action_controller/caching/sweeping.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'actionpack/lib/action_controller/caching')

diff --git a/actionpack/lib/action_controller/caching/sweeping.rb b/actionpack/lib/action_controller/caching/sweeping.rb
index 49cf70ec21..808a6fe5f3 100644
--- a/actionpack/lib/action_controller/caching/sweeping.rb
+++ b/actionpack/lib/action_controller/caching/sweeping.rb
@@ -88,7 +88,7 @@ module ActionController #:nodoc:
           end
 
           def method_missing(method, *arguments, &block)
-            return unless @controller
+            super unless @controller
             @controller.__send__(method, *arguments, &block)
           end
       end
-- 
cgit v1.2.3


From 5ae53d5cde5a5e3041d72a671f7763f6951fab4c Mon Sep 17 00:00:00 2001
From: Sandeep <sandeep.ravichandran@sourcebits.com>
Date: Fri, 16 Mar 2012 19:41:15 +0530
Subject: fixed - warning: instance variable @controller not initialized

---
 actionpack/lib/action_controller/caching/sweeping.rb | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'actionpack/lib/action_controller/caching')

diff --git a/actionpack/lib/action_controller/caching/sweeping.rb b/actionpack/lib/action_controller/caching/sweeping.rb
index 808a6fe5f3..bb176ca3f9 100644
--- a/actionpack/lib/action_controller/caching/sweeping.rb
+++ b/actionpack/lib/action_controller/caching/sweeping.rb
@@ -54,6 +54,11 @@ module ActionController #:nodoc:
       class Sweeper < ActiveRecord::Observer #:nodoc:
         attr_accessor :controller
 
+        def initialize(*args)
+          super
+          @controller = nil
+        end
+
         def before(controller)
           self.controller = controller
           callback(:before) if controller.perform_caching
-- 
cgit v1.2.3