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

Trigger error in case of SRDF syntax error #41

Merged
merged 2 commits into from
Oct 25, 2018

Conversation

kkufieta
Copy link
Contributor

This is to help with this issue in MoveIt!

Copy link
Contributor

@rhaschke rhaschke left a comment

Choose a reason for hiding this comment

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

LGTM. Thanks!
Did you checked that this false return value is correctly handled by callers?

@rhaschke
Copy link
Contributor

Fixes moveit/moveit#967.

src/model.cpp Outdated
{
CONSOLE_BRIDGE_logError("Could not parse the SRDF XML File. %s", xml_doc.ErrorDesc());
return false;
}
Copy link
Member

Choose a reason for hiding this comment

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

indentation bad: #42

@kkufieta
Copy link
Contributor Author

@rhaschke initString already forwards false from initXml when it fails to find the robot element in the xml file. My change just catches the syntax failure case in addition and treats it the same way.

@jonbinney
Copy link
Contributor

@kkufieta can you rebase and run clang-format?

@kkufieta kkufieta force-pushed the kk-return-error-value branch from 1d105b3 to b8d8a3c Compare October 25, 2018 22:25
@jonbinney jonbinney merged commit 26ef556 into moveit:melodic-devel Oct 25, 2018
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.

4 participants