[FIX] jsonP-requests issue for real

bzr revid: xmo@openerp.com-20111220114732-gekgwwb0ry0sdqil

diff --git a/addons/web/common/http.py b/addons/web/common/http.py
index 9000900..ad23dbc 100644 (file)
--- a/addons/web/common/http.py
+++ b/addons/web/common/http.py
@@ -355,8 +355,10 @@ def session_context(request, storage_path, session_cookie='sessionid'):
                     if stored and isinstance(v, session.OpenERPSession):
                         v.contexts_store.update(stored.contexts_store)
                         v.domains_store.update(stored.domains_store)
-                        jsonp = getattr(v, 'jsonp_requests', {})
-                        jsonp.update(stored.jsonp_requests)
+                        if not hasattr(v, 'jsonp_requests'):
+                            v.jsonp_requests = {}
+                        v.jsonp_requests.update(getattr(
+                            stored, 'jsonp_requests', {}))
 
                 # add missing keys
                 for k, v in in_store.iteritems():