[MERGE] forward port branch saas-14 up to d171f282c37

1 files changed, 2 insertions, 5 deletions

diff --git a/odoo/service/server.py b/odoo/service/server.py
index 5078340b057..467618053e2 100644
--- a/odoo/service/server.py
+++ b/odoo/service/server.py
@@ -216,14 +216,11 @@ class ThreadedServer(CommonServer):
             registries = odoo.modules.registry.Registry.registries
             _logger.debug('cron%d polling for jobs', number)
             for db_name, registry in registries.iteritems():
-                while registry.ready:
+                if registry.ready:
                     try:
-                        acquired = odoo.addons.base.ir.ir_cron.ir_cron._acquire_job(db_name)
-                        if not acquired:
-                            break
+                        odoo.addons.base.ir.ir_cron.ir_cron._acquire_job(db_name)
                     except Exception:
                         _logger.warning('cron%d encountered an Exception:', number, exc_info=True)
-                        break
 
     def cron_spawn(self):
         """ Start the above runner function in a daemon thread.