Corrected errorgit add *

Signed-off-by: ivanpauno <ivanpauno@ekumenlabs.com>
ros2 · Aug 30, 2019 · dc48f04 · dc48f04
1 parent 9744a6d
commit dc48f04
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/rmw_fastrtps_shared_cpp/src/rmw_node_info_and_types.cpp b/rmw_fastrtps_shared_cpp/src/rmw_node_info_and_types.cpp
@@ -59,7 +59,7 @@ rmw_ret_t __get_guid_by_name(
   const char * node_namespace, GUID_t & guid)
 {
   auto impl = static_cast<CustomParticipantInfo *>(node->data);
-  if (strcmp(node->name, node_name) == 0) {
+  if (strcmp(node->name, node_name) == 0 && strcmp(node->namespace_, node_namespace) == 0) {
     guid = impl->participant->getGuid();
   } else {
     std::set<GUID_t> nodes_in_desired_namespace;
@@ -81,7 +81,11 @@ rmw_ret_t __get_guid_by_name(
         });
 
     if (guid_node_pair == impl->listener->discovered_names.end()) {
-      RMW_SET_ERROR_MSG("Node name not found: ns='%s', name='%s", node_namespace, node_name);
+      RMW_SET_ERROR_MSG_WITH_FORMAT_STRING(
+        "Node name not found: ns='%s', name='%s",
+        node_namespace,
+        node_name
+      );
       return RMW_RET_NODE_NAME_NON_EXISTENT;
     }
     guid = guid_node_pair->first;