summaryrefslogtreecommitdiff
path: root/odoo
diff options
context:
space:
mode:
authorChristophe Simonis <chs@odoo.com>2018-06-14 21:28:39 +0200
committerChristophe Simonis <chs@odoo.com>2018-06-14 21:28:39 +0200
commitb05e4d5f958892a9ff644b28a4ee165aeb2ea247 (patch)
tree49c4237e12ae99f3f78e4b496b27dae4455db800 /odoo
parent5ac40752a4845340c4bd582075caaf0dd478d639 (diff)
parenta53bea49fe4005e3faaa3e63888da65a45281dd5 (diff)
[MERGE] forward port branch saas-15 up to a53bea49fe4
Diffstat (limited to 'odoo')
-rw-r--r--odoo/modules/registry.py4
-rw-r--r--odoo/service/server.py1
2 files changed, 1 insertions, 4 deletions
diff --git a/odoo/modules/registry.py b/odoo/modules/registry.py
index 1cbe67bd5c3..8122ae4100a 100644
--- a/odoo/modules/registry.py
+++ b/odoo/modules/registry.py
@@ -153,9 +153,7 @@ class Registry(Mapping):
""" Delete the registry linked to a given database. """
with cls._lock:
if db_name in cls.registries:
- registry = cls.registries.pop(db_name)
- registry.clear_caches()
- registry.registry_invalidated = True
+ cls.registries.pop(db_name)
@classmethod
def delete_all(cls):
diff --git a/odoo/service/server.py b/odoo/service/server.py
index 259bad913fa..a11e7a503a0 100644
--- a/odoo/service/server.py
+++ b/odoo/service/server.py
@@ -828,7 +828,6 @@ class WorkerCron(Worker):
from odoo.addons import base
base.ir.ir_cron.ir_cron._acquire_job(db_name)
- odoo.modules.registry.Registry.delete(db_name)
# dont keep cursors in multi database mode
if len(db_names) > 1: