aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib
diff options
context:
space:
mode:
Diffstat (limited to 'actionpack/lib')
-rw-r--r--actionpack/lib/action_dispatch/middleware/session/abstract_store.rb3
1 files changed, 1 insertions, 2 deletions
diff --git a/actionpack/lib/action_dispatch/middleware/session/abstract_store.rb b/actionpack/lib/action_dispatch/middleware/session/abstract_store.rb
index e9e0c26c73..bc1d6fab83 100644
--- a/actionpack/lib/action_dispatch/middleware/session/abstract_store.rb
+++ b/actionpack/lib/action_dispatch/middleware/session/abstract_store.rb
@@ -24,7 +24,7 @@ module ActionDispatch
def [](key)
if key == :id
- load_session_id! unless key?(:id) || has_session_id?
+ load_session_id! unless super(:id) || has_session_id?
end
super(key)
end
@@ -37,7 +37,6 @@ module ActionDispatch
def load_session_id!
self[:id] = @by.send(:extract_session_id, @env)
- ensure
@session_id_loaded = true
end
end