openstack/heat
Code Issues Proposed changes

Merge "Remove redundant null engine id check"

Browse Source
This commit is contained in:
Zuul 2017-11-03 03:04:31 +00:00 committed by Gerrit Code Review
commit 86fcc11b80
1 changed files with 2 additions and 4 deletions

6
heat/engine/resource.py

@ -2003,10 +2003,8 @@ class Resource(status.ResourceStatus):
if (lock == self.LOCK_NONE or self._calling_engine_id is None):
resource_objects.Resource.update_by_id(
self.context, self.id, rs)
if (lock != self.LOCK_NONE and
self._calling_engine_id is None):
LOG.warning('no calling_engine_id in store %s',
str(rs))
if lock != self.LOCK_NONE:
LOG.warning("no calling_engine_id in store %s", str(rs))
else:
self._store_with_lock(rs, lock)
else: