[openrtm-commit:02650] r848 - trunk/OpenRTM-aist-Python/OpenRTM_aist

[openrtm ＠ openrtm.org]

Author: miyamoto
Date: 2017-06-21 09:08:57 +0900 (Wed, 21 Jun 2017)
New Revision: 848

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-20 11:26:07 UTC (rev 847)
+++ trunk/OpenRTM-aist-Python/OpenRTM_aist/ManagerServant.py	2017-06-21 00:08:57 UTC (rev 848)
@@ -354,6 +354,8 @@
     self.get_parameter_by_modulename("manager_address",module_name)
     manager_name = self.get_parameter_by_modulename("manager_name",module_name)
     module_name = module_name[0]
+    tmp = [module_name]
+    language = self.get_parameter_by_modulename("language",tmp)
     
     
     if self._isMaster:
@@ -360,9 +362,14 @@
       guard = OpenRTM_aist.ScopedLock(self._slaveMutex)
       for slave in self._slaves[:]:
         try:
-          rtc = slave.create_component(module_name)
-          if not CORBA.is_nil(rtc):
-            return rtc
+          prof = slave.get_configuration()
+          prop = OpenRTM_aist.Properties()
+          OpenRTM_aist.NVUtil.copyToProperties(prop, prof)
+          slave_lang = prop.getProperty("manager.language")
+          if slave_lang == language:
+            rtc = slave.create_component(module_name)
+            if not CORBA.is_nil(rtc):
+              return rtc
         except:
           self._rtcout.RTC_ERROR("Unknown exception cought.")
           self._rtcout.RTC_DEBUG(OpenRTM_aist.Logger.print_exception())