Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

made local timer a member so we can cancel it during shutdown #11

Merged
merged 1 commit into from Dec 9, 2015

Conversation

hugomatic
Copy link

Fixes #9

@esteve esteve self-assigned this Dec 9, 2015
@esteve
Copy link
Member

esteve commented Dec 9, 2015

@hugomatic Thanks!

esteve added a commit that referenced this pull request Dec 9, 2015
made local timer a member so we can cancel it during shutdown
@esteve esteve merged commit 7d8cf85 into ros:master Dec 9, 2015
@hugomatic hugomatic deleted the time_out_cancel branch December 9, 2015 23:29
@@ -309,16 +314,16 @@ def wait_until_formed(self, timeout = None):
# \param timeout Maximum duration to wait. If None then this call will not timeout.
# \return true iff the bond has been broken, even if it has never been formed.
def wait_until_broken(self, timeout = None):
deadline = timeout and Timeout(timeout).reset()
self.deadline = timeout and Timeout(timeout).reset()
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We'll change the original line to something more readable.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants