From 01472b5217ab3a8c03619ca458ec05552b4c7a88 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Valim?= Date: Fri, 25 Jun 2010 19:03:00 +0200 Subject: Do not mark the session as loaded if an error happened while doing it. --- actionpack/lib/action_dispatch/middleware/session/abstract_store.rb | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'actionpack') 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 -- cgit v1.2.3