[openrtm-commit:01850] r695 - trunk/OpenRTM-aist-Python/OpenRTM_aist

[openrtm ＠ openrtm.org]

Author: miyamoto
Date: 2016-03-12 13:10:25 +0900 (Sat, 12 Mar 2016)
New Revision: 695

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

Modified: trunk/OpenRTM-aist-Python/OpenRTM_aist/Manager.py
===================================================================
--- trunk/OpenRTM-aist-Python/OpenRTM_aist/Manager.py	2016-03-11 19:59:58 UTC (rev 694)
+++ trunk/OpenRTM-aist-Python/OpenRTM_aist/Manager.py	2016-03-12 04:10:25 UTC (rev 695)
@@ -903,6 +903,10 @@
       if self._config.findNode(inherit_prop[i]):
         prop.setProperty(inherit_prop[i],self._config.getProperty(inherit_prop[i]))
 
+    prop_ = prop.getNode("port")
+    prop_.mergeProperties(self._config.getNode("port"))
+    
+
     comp = factory.create(self)
 
     if comp is None: