[openrtm-commit:03107] r925 - trunk/OpenRTM-aist-Python/OpenRTM_aist

[openrtm ＠ openrtm.org]

Author: miyamoto
Date: 2018-01-23 11:48:34 +0900 (Tue, 23 Jan 2018)
New Revision: 925

Modified:
   trunk/OpenRTM-aist-Python/OpenRTM_aist/Manager.py
Log:
[compat, bugfix, ->RELENG_1_2] refs #3983

Modified: trunk/OpenRTM-aist-Python/OpenRTM_aist/Manager.py
===================================================================
--- trunk/OpenRTM-aist-Python/OpenRTM_aist/Manager.py	2018-01-23 02:28:22 UTC (rev 924)
+++ trunk/OpenRTM-aist-Python/OpenRTM_aist/Manager.py	2018-01-23 02:48:34 UTC (rev 925)
@@ -985,9 +985,9 @@
     prop_ = prop.getNode("port")
     prop_.mergeProperties(self._config.getNode("port"))
 
+
     comp = factory.create(self)
-    if self._config.getProperty("corba.endpoints_ipv4") == "":
-      self.setEndpointProperty(comp.getObjRef())
+    
 
     for i in range(len(inherit_prop)):
       if self._config.findNode(inherit_prop[i]):
@@ -997,6 +997,10 @@
       self._rtcout.RTC_ERROR("createComponent: RTC creation failed: %s",
                              comp_id.getProperty("implementation_id"))
       return None
+
+    if self._config.getProperty("corba.endpoints_ipv4") == "":
+      self.setEndpointProperty(comp.getObjRef())
+      
     self._rtcout.RTC_TRACE("RTC Created: %s", comp_id.getProperty("implementation_id"))
     self._listeners.rtclifecycle_.postCreate(comp)
 
@@ -1030,6 +1034,7 @@
       if comp.exit() != RTC.RTC_OK:
         self._rtcout.RTC_DEBUG("%s finalization was failed.",
                                comp_id.getProperty("implementation_id"))
+      comp.exit()
       return None
       
     self._rtcout.RTC_TRACE("RTC initialization succeeded: %s",