Merge "Removed a non-conditional 'if' statement"

This commit is contained in:
Jenkins 2015-06-09 00:18:40 +00:00 committed by Gerrit Code Review
commit 88dcf64b47
1 changed files with 15 additions and 18 deletions

View File

@ -392,7 +392,6 @@ class Host(object):
event = args[0]
self._events_delayed.pop(event.uuid, None)
if self._lifecycle_delay > 0:
# Cleanup possible delayed stop events.
if event.uuid in self._events_delayed.keys():
self._events_delayed[event.uuid].cancel()
@ -411,8 +410,6 @@ class Host(object):
id_.link(event_cleanup, event)
else:
self._event_emit(event)
else:
self._event_emit(event)
def _event_emit(self, event):
if self._lifecycle_event_handler is not None: