[FIX] stop blowing up on old sessions

lp bug: https://launchpad.net/bugs/906225 fixed

bzr revid: xmo@openerp.com-20111219104316-rssxn3oqne7070a4
This commit is contained in:
Xavier Morel 2011-12-19 11:43:16 +01:00
parent 30233c37b7
commit eec5f1c6c4
1 changed files with 3 additions and 3 deletions

View File

@ -353,11 +353,11 @@ def session_context(request, storage_path, session_cookie='sessionid'):
in_store = session_store.get(sid)
for k, v in request.session.iteritems():
stored = in_store.get(k)
if stored and isinstance(v, session.OpenERPSession)\
and v != stored:
if stored and isinstance(v, session.OpenERPSession):
v.contexts_store.update(stored.contexts_store)
v.domains_store.update(stored.domains_store)
v.jsonp_requests.update(stored.jsonp_requests)
jsonp = getattr(v, 'jsonp_requests', {})
jsonp.update(stored.jsonp_requests)
# add missing keys
for k, v in in_store.iteritems():