diff options
| author | Xavier Noria <fxn@hashref.com> | 2010-07-30 02:35:24 +0200 |
|---|---|---|
| committer | Xavier Noria <fxn@hashref.com> | 2010-07-30 02:35:24 +0200 |
| commit | ccd45618ed9a629c9535a5ff84ef5c238befa4ab (patch) | |
| tree | 0a582bf695dce01240762d2b8516efde43bc3515 /actionpack/lib/action_dispatch/middleware/session | |
| parent | 3c3ff1377d17b584dd14d85c7cecab59ddff2679 (diff) | |
| parent | 755af497555fde16db86f7e51f6462b0aca79b49 (diff) | |
| download | rails-ccd45618ed9a629c9535a5ff84ef5c238befa4ab.tar.gz rails-ccd45618ed9a629c9535a5ff84ef5c238befa4ab.tar.bz2 rails-ccd45618ed9a629c9535a5ff84ef5c238befa4ab.zip | |
Merge remote branch 'rails/master'
Diffstat (limited to 'actionpack/lib/action_dispatch/middleware/session')
| -rw-r--r-- | actionpack/lib/action_dispatch/middleware/session/abstract_store.rb | 7 | ||||
| -rw-r--r-- | actionpack/lib/action_dispatch/middleware/session/mem_cache_store.rb | 1 |
2 files changed, 3 insertions, 5 deletions
diff --git a/actionpack/lib/action_dispatch/middleware/session/abstract_store.rb b/actionpack/lib/action_dispatch/middleware/session/abstract_store.rb index ad98249468..dd82294644 100644 --- a/actionpack/lib/action_dispatch/middleware/session/abstract_store.rb +++ b/actionpack/lib/action_dispatch/middleware/session/abstract_store.rb @@ -191,11 +191,8 @@ module ActionDispatch def load_session(env) stale_session_check! do - if sid = current_session_id(env) - sid, session = get_session(env, sid) - else - sid, session = generate_sid, {} - end + sid = current_session_id(env) + sid, session = get_session(env, sid) [sid, session] end end diff --git a/actionpack/lib/action_dispatch/middleware/session/mem_cache_store.rb b/actionpack/lib/action_dispatch/middleware/session/mem_cache_store.rb index 5304440418..28e3dbd732 100644 --- a/actionpack/lib/action_dispatch/middleware/session/mem_cache_store.rb +++ b/actionpack/lib/action_dispatch/middleware/session/mem_cache_store.rb @@ -25,6 +25,7 @@ module ActionDispatch private def get_session(env, sid) + sid ||= generate_sid begin session = @pool.get(sid) || {} rescue MemCache::MemCacheError, Errno::ECONNREFUSED |