Merge pull request #102 from ros2/opensplice_dynamic_ros_domain_id

always ensure that the ROS_DOMAIN_ID is set
ros2 · Sep 17, 2015 · d8b7ce8 · d8b7ce8
2 parents 6f07517 + 3eb44ed
commit d8b7ce8
Showing 1 changed file with 1 addition and 3 deletions.
diff --git a/rclcpp/include/rclcpp/node_impl.hpp b/rclcpp/include/rclcpp/node_impl.hpp
@@ -71,12 +71,10 @@ Node::Node(
       throw std::runtime_error("failed to interpret ROS_DOMAIN_ID as integral number");
     }
     domain_id = static_cast<size_t>(number);
-  }
 #ifdef _WIN32
-  if (ros_domain_id) {
     free(ros_domain_id);
-  }
 #endif
+  }
 
   auto node = rmw_create_node(name_.c_str(), domain_id);
   if (!node) {