From: Mack <mackz@sina.com>
Date: Tue, 11 Nov 2014 14:26:33 +0000 (+0800)
Subject: [FIX] http.py: no traceback for SessionExpiredException
X-Git-Url: http://git.inspyration.org/?p=odoo%2Fodoo.git;a=commitdiff_plain;h=ffda02329595faf38dd6fb337217fd28772ba565

[FIX] http.py: no traceback for SessionExpiredException

Rebase and close #3618
---

diff --git a/openerp/http.py b/openerp/http.py
index 3435204..eddbcb6 100644
--- a/openerp/http.py
+++ b/openerp/http.py
@@ -516,16 +516,19 @@ class JsonRequest(WebRequest):
         try:
             return super(JsonRequest, self)._handle_exception(exception)
         except Exception:
-            if not isinstance(exception, openerp.exceptions.Warning):
+            if not isinstance(exception, (openerp.exceptions.Warning, SessionExpiredException)):
                 _logger.exception("Exception during JSON request handling.")
             error = {
                     'code': 200,
-                    'message': "OpenERP Server Error",
+                    'message': "Odoo Server Error",
                     'data': serialize_exception(exception)
             }
             if isinstance(exception, AuthenticationError):
                 error['code'] = 100
-                error['message'] = "OpenERP Session Invalid"
+                error['message'] = "Odoo Session Invalid"
+            if isinstance(exception, SessionExpiredException):
+                error['code'] = 100
+                error['message'] = "Odoo Session Expired"
             return self._json_response(error=error)
 
     def dispatch(self):