From eec5f1c6c4af40860b9544c516d0786cf6ad0d22 Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Mon, 19 Dec 2011 11:43:16 +0100 Subject: [PATCH] [FIX] stop blowing up on old sessions lp bug: https://launchpad.net/bugs/906225 fixed bzr revid: xmo@openerp.com-20111219104316-rssxn3oqne7070a4 --- addons/web/common/http.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/addons/web/common/http.py b/addons/web/common/http.py index 84ef4035b79..bab1a57cf1d 100644 --- a/addons/web/common/http.py +++ b/addons/web/common/http.py @@ -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():