From 481f30ee657293ddc3460ba2a031c16c536887cd Mon Sep 17 00:00:00 2001
From: Aaron Patterson <aaron.patterson@gmail.com>
Date: Thu, 18 Oct 2012 17:50:02 -0700
Subject: keep a singleton filter around that we can use when no filter is set

---
 actionpack/lib/action_dispatch/http/filter_parameters.rb | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'actionpack')

diff --git a/actionpack/lib/action_dispatch/http/filter_parameters.rb b/actionpack/lib/action_dispatch/http/filter_parameters.rb
index 91dfec5c35..8e3443f349 100644
--- a/actionpack/lib/action_dispatch/http/filter_parameters.rb
+++ b/actionpack/lib/action_dispatch/http/filter_parameters.rb
@@ -22,6 +22,8 @@ module ActionDispatch
     module FilterParameters
       @@parameter_filter_for  = {}
 
+      NULL_FILTER = ParameterFilter.new # :nodoc:
+
       def initialize(env)
         super
         @filtered_parameters = nil
@@ -47,7 +49,9 @@ module ActionDispatch
     protected
 
       def parameter_filter
-        parameter_filter_for(@env["action_dispatch.parameter_filter"])
+        parameter_filter_for @env.fetch("action_dispatch.parameter_filter") {
+          return NULL_FILTER
+        }
       end
 
       def env_filter
@@ -55,7 +59,7 @@ module ActionDispatch
       end
 
       def parameter_filter_for(filters)
-        @@parameter_filter_for[filters] ||= ParameterFilter.new(filters || [])
+        @@parameter_filter_for[filters] ||= ParameterFilter.new(filters)
       end
 
       KV_RE   = '[^&;=]+'
-- 
cgit v1.2.3