niklas/rclcpp
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #366 from ros2/reset_error_code_init_failed

Browse source 
reset error code before throwing in rclcpp::utilities::init
This commit is contained in:
Dirk Thomas 2017-08-31 16:44:01 -07:00 • committed by GitHub
commit f175726b0e
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
rclcpp/src/rclcpp/utilities.cpp
View file

@ -163,10 +163,10 @@ rclcpp::utilities::init(int argc, char * argv[])
{ {
g_is_interrupted.store(false); g_is_interrupted.store(false);
if (rcl_init(argc, argv, rcl_get_default_allocator()) != RCL_RET_OK) { if (rcl_init(argc, argv, rcl_get_default_allocator()) != RCL_RET_OK) {
// *INDENT-OFF* (prevent uncrustify from making unnecessary indents here) std::string msg = "failed to initialize rmw implementation: ";
throw std::runtime_error( msg += rcl_get_error_string_safe();
std::string("failed to initialize rmw implementation: ") + rcl_get_error_string_safe()); rcl_reset_error();
// *INDENT-ON* throw std::runtime_error(msg);
} }
#ifdef HAS_SIGACTION #ifdef HAS_SIGACTION
struct sigaction action; struct sigaction action;