cherry-pick #824 from kinetic-devel #848
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Just to be sure I understand from my review... this main feature was already cherry picked into indigo but there was a bugfix afterwards for the feature that was only applied to kinetic and not indigo? I want to make sure we aren't making major behavior changes in this stable branch. |
|
@davetcoleman Yes, the main feature was applied to both, Kinetic (#350) and Indigo (#752). However, it turned out that this initial fix for race conditions wasn't complete (#350 (comment)). Hence, I filed a fix for Kinetic first (#824) as well as for Indigo (here). |
explicitly enforce updateSceneWithCurrentState() in waitForCurrentRobotState()
rhaschke
force-pushed
the
indigo-fix-race-condition
branch
from
053eb7d to
20ae37a
Compare
v4hn
approved these changes
Apr 20, 2018
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Cherry-picking #824 for Indigo:
Explicitly enforce
updateSceneWithCurrentState()inwaitForCurrentRobotState().@v4hn, @davetcoleman: Please review and merge this simple fix (and its original #824).