[openrtm-commit:01765] r665 - trunk/OpenRTM-aist-Python/OpenRTM_aist

[openrtm ＠ openrtm.org]

Author: miyamoto
Date: 2016-02-26 19:11:15 +0900 (Fri, 26 Feb 2016)
New Revision: 665

Modified:
   trunk/OpenRTM-aist-Python/OpenRTM_aist/Manager.py
Log:
[compat,->RELENG_1_2]The processing in initPreActivation() method has been changed. refs #3405

Modified: trunk/OpenRTM-aist-Python/OpenRTM_aist/Manager.py
===================================================================
--- trunk/OpenRTM-aist-Python/OpenRTM_aist/Manager.py	2016-02-26 10:09:40 UTC (rev 664)
+++ trunk/OpenRTM-aist-Python/OpenRTM_aist/Manager.py	2016-02-26 10:11:15 UTC (rev 665)
@@ -2755,12 +2755,19 @@
       OpenRTM_aist.eraseTailBlank(tmp)
       c = tmp[0]
       if c:
-        comp = self.getComponent(c)
-        
-        if comp is None:
-          self._rtcout.RTC_ERROR("%s not found." % c)
-          continue
-        ret = OpenRTM_aist.CORBA_RTCUtil.activate(comp.getObjRef())
+        if len(c.split("//")) < 2:
+          comp = self.getComponent(c)
+          if comp is None:
+            self._rtcout.RTC_ERROR("%s not found." % c)
+            continue
+          comp_ref = comp.getObjRef()
+        else:
+          rtcs = self._namingManager.string_to_component(c)
+          if len(rtcs) == 0:
+            self._rtcout.RTC_ERROR("%s not found." % c)
+            continue
+          comp_ref = rtcs[0]
+        ret = OpenRTM_aist.CORBA_RTCUtil.activate(comp_ref)
         if ret != RTC.RTC_OK:
           self._rtcout.RTC_ERROR("%s activation filed." % c)
         else: