names::clean() will turn a '/' into '' (is that a bug or desired?), b…

…ut also prefix a slash as needed, so accommodating that here. ros#1094
lucasw · Jul 15, 2017 · 3f3e3b5 · 3f3e3b5
1 parent 2d22f97
commit 3f3e3b5
Showing 1 changed file with 2 additions and 5 deletions.
diff --git a/clients/roscpp/src/libros/this_node.cpp b/clients/roscpp/src/libros/this_node.cpp
@@ -145,12 +145,9 @@ void ThisNode::init(const std::string& name, const M_string& remappings, uint32_
     namespace_ = "/";
   }
 
-  namespace_ = (namespace_ == "/")
-    ? std::string("/") 
-    : ("/" + namespace_)
-    ;
-
   namespace_ = names::clean(namespace_);
+  if (namespace_ == "")
+    namespace_ = "/";
 
   std::string error;
   if (!names::validate(namespace_, error))