[MERGE] forward port branch 12.0 up to 4870251f0b0

2 files changed, 12 insertions, 8 deletions

diff --git a/odoo/addons/test_new_api/__manifest__.py b/odoo/addons/test_new_api/__manifest__.py
index e238f37f779..ec4bdae82bc 100644
--- a/odoo/addons/test_new_api/__manifest__.py
+++ b/odoo/addons/test_new_api/__manifest__.py
@@ -10,7 +10,9 @@
     'data': [
         'ir.model.access.csv',
         'views.xml',
-        'demo_data.xml',
         'template.xml',
     ],
+    'demo': [
+        'demo_data.xml',
+    ],
 }
diff --git a/odoo/http.py b/odoo/http.py
index 886fecc48ba..217720f6a72 100644
--- a/odoo/http.py
+++ b/odoo/http.py
@@ -280,13 +280,15 @@ class WebRequest(object):
         _request_stack.pop()
 
         if self._cr:
-            if exc_type is None and not self._failed:
-                self._cr.commit()
-                if self.registry:
-                    self.registry.signal_changes()
-            elif self.registry:
-                self.registry.reset_changes()
-            self._cr.close()
+            try:
+                if exc_type is None and not self._failed:
+                    self._cr.commit()
+                    if self.registry:
+                        self.registry.signal_changes()
+                elif self.registry:
+                    self.registry.reset_changes()
+            finally:
+                self._cr.close()
         # just to be sure no one tries to re-use the request
         self.disable_db = True
         self.uid = None