[openrtm-commit:02642] r845 - trunk/OpenRTM-aist-Python/OpenRTM_aist

[openrtm ＠ openrtm.org]

Author: miyamoto
Date: 2017-06-19 09:10:13 +0900 (Mon, 19 Jun 2017)
New Revision: 845

Modified:
   trunk/OpenRTM-aist-Python/OpenRTM_aist/ManagerServant.py
Log:
[compat,->RELENG_1_2] bug fix.

Modified: trunk/OpenRTM-aist-Python/OpenRTM_aist/ManagerServant.py
===================================================================
--- trunk/OpenRTM-aist-Python/OpenRTM_aist/ManagerServant.py	2017-06-15 01:45:41 UTC (rev 844)
+++ trunk/OpenRTM-aist-Python/OpenRTM_aist/ManagerServant.py	2017-06-19 00:10:13 UTC (rev 845)
@@ -352,7 +352,7 @@
     #module_name = module_name.split("&")[0]
     module_name = [module_name]
     self.get_parameter_by_modulename("manager_address",module_name)
-    self.get_parameter_by_modulename("manager_name",module_name)
+    manager_name = self.get_parameter_by_modulename("manager_name",module_name)
     module_name = module_name[0]
     
     
@@ -368,12 +368,12 @@
           self._rtcout.RTC_DEBUG(OpenRTM_aist.Logger.print_exception())
           self._slaves.remove(slave)
       del guard
+      if not manager_name:
+        module_name = module_name + "&manager_name=manager_%p"
+        
+        rtc = self.create_component_by_mgrname(module_name)
+        return rtc
 
-      module_name = module_name + "&manager_name=manager_%p"
-      
-      rtc = self.create_component_by_mgrname(module_name)
-      return rtc
-
     else:
       # create on this manager
       rtc = self._mgr.createComponent(module_name)