[MERGE] Forward-port of saas-3 up to 141e1b2

[odoo/odoo.git] / openerp / http.py

diff --git a/openerp/http.py b/openerp/http.py
index f67c08d..295a087 100644 (file)
--- a/openerp/http.py
+++ b/openerp/http.py
@@ -1224,7 +1224,10 @@ class Root(object):
             request = self.get_request(httprequest)
 
             def _dispatch_nodb():
-                func, arguments = self.nodb_routing_map.bind_to_environ(request.httprequest.environ).match()
+                try:
+                    func, arguments = self.nodb_routing_map.bind_to_environ(request.httprequest.environ).match()
+                except werkzeug.exceptions.HTTPException, e:
+                    return request._handle_exception(e)
                 request.set_handler(func, arguments, "none")
                 result = request.dispatch()
                 return result