diff options
| author | José Valim <jose.valim@gmail.com> | 2010-06-25 19:03:00 +0200 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2010-06-25 19:03:00 +0200 |
| commit | 01472b5217ab3a8c03619ca458ec05552b4c7a88 (patch) | |
| tree | b0297a2eca97382612d9e2da7fccf09313b4adbc /actionpack/lib | |
| parent | 21c99e93883c1cf32474ad65a507e69e373a380c (diff) | |
| download | rails-01472b5217ab3a8c03619ca458ec05552b4c7a88.tar.gz rails-01472b5217ab3a8c03619ca458ec05552b4c7a88.tar.bz2 rails-01472b5217ab3a8c03619ca458ec05552b4c7a88.zip | |
Do not mark the session as loaded if an error happened while doing it.
Diffstat (limited to 'actionpack/lib')
| -rw-r--r-- | actionpack/lib/action_dispatch/middleware/session/abstract_store.rb | 3 |
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 |