[FIX] avoid blank page when the database assigned to the session has been removed

bzr revid: chs@openerp.com-20120119143057-pbqdh15jptyc7y0a

diff --git a/addons/web/common/session.py b/addons/web/common/session.py
index ca23a08..24564ba 100644 (file)
--- a/addons/web/common/session.py
+++ b/addons/web/common/session.py
@@ -80,6 +80,13 @@ class OpenERPSession(object):
         """
         self.build_connection().check_login(force)
 
+    def ensure_valid(self):
+        if self._uid:
+            try:
+                self.assert_valid(True)
+            except Exception:
+                self._uid = None
+
     def execute(self, model, func, *l, **d):
         self.assert_valid()
         model = self.build_connection().get_model(model)

diff --git a/addons/web/controllers/main.py b/addons/web/controllers/main.py
index d578025..bb08393 100644 (file)
--- a/addons/web/controllers/main.py
+++ b/addons/web/controllers/main.py
@@ -360,6 +360,7 @@ class Session(openerpweb.Controller):
     _cp_path = "/web/session"
 
     def session_info(self, req):
+        req.session.ensure_valid()
         return {
             "session_id": req.session_id,
             "uid": req.session._uid,