Merge pull request #8019 from lest/patch-1

memoize calculated ip without additional variable
rails · Nov 1, 2012 · 2e20a7d · 2e20a7d
2 parents 694334c + 43aa2d3
commit 2e20a7d
Showing 1 changed file with 4 additions and 6 deletions.
diff --git a/actionpack/lib/action_dispatch/middleware/remote_ip.rb b/actionpack/lib/action_dispatch/middleware/remote_ip.rb
@@ -63,9 +63,9 @@ class GetIp
       }x
 
       def initialize(env, middleware)
-        @env           = env
-        @middleware    = middleware
-        @calculated_ip = false
+        @env        = env
+        @middleware = middleware
+        @ip         = nil
       end
 
       # Determines originating IP address. REMOTE_ADDR is the standard
@@ -100,9 +100,7 @@ def calculate_ip
       end
 
       def to_s
-        return @ip if @calculated_ip
-        @calculated_ip = true
-        @ip = calculate_ip
+        @ip ||= calculate_ip
       end
 
       private