openstack/oslo.messaging
Code Issues Proposed changes

Merge "Minor improvement"

Browse Source
This commit is contained in:
Jenkins 2015-03-20 09:17:30 +00:00 committed by Gerrit Code Review
commit a63022b7be
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
oslo_messaging/_drivers/common.py
View File

@ -345,7 +345,7 @@ class DecayingTimer(object):
maximum = kwargs.pop('maximum', None) maximum = kwargs.pop('maximum', None)
if self._duration is None: if self._duration is None:
return None if maximum is None else maximum return maximum
if self._ends_at is None: if self._ends_at is None:
raise RuntimeError(_("Can not check/return a timeout from a timer" raise RuntimeError(_("Can not check/return a timeout from a timer"
" that has not been started.")) " that has not been started."))