[openrtm-commit:02208] r775 - trunk/OpenRTM-aist-Python/OpenRTM_aist

[openrtm ＠ openrtm.org]

Author: miyamoto
Date: 2017-01-12 19:13:00 +0900 (Thu, 12 Jan 2017)
New Revision: 775

Modified:
   trunk/OpenRTM-aist-Python/OpenRTM_aist/ConfigAdmin.py
   trunk/OpenRTM-aist-Python/OpenRTM_aist/CorbaConsumer.py
   trunk/OpenRTM-aist-Python/OpenRTM_aist/InPortBase.py
Log:
[compat,bugfix,->RELENG_1_2] fixed bug.

Modified: trunk/OpenRTM-aist-Python/OpenRTM_aist/ConfigAdmin.py
===================================================================
--- trunk/OpenRTM-aist-Python/OpenRTM_aist/ConfigAdmin.py	2017-01-12 08:15:07 UTC (rev 774)
+++ trunk/OpenRTM-aist-Python/OpenRTM_aist/ConfigAdmin.py	2017-01-12 10:13:00 UTC (rev 775)
@@ -896,8 +896,8 @@
   def getConfigurationSet(self, config_id):
     
     prop = self._configsets.findNode(config_id)
-    if prop is None:
-      return self._emptyconf
+    #if prop is None:
+    #  return self._emptyconf
     return prop
 
 
@@ -935,8 +935,8 @@
       return False
 
     p = self._configsets.getNode(node_)
-    if p is None:
-      return False
+    #if p is None:
+    #  return False
 
     p.mergeProperties(config_set)
     self._changed = True
@@ -1013,8 +1013,8 @@
     self._configsets.createNode(node)
 
     p = self._configsets.getNode(node)
-    if p is None:
-      return False
+    #if p is None:
+    #  return False
 
     p.mergeProperties(configset)
     self._newConfig.append(node)

Modified: trunk/OpenRTM-aist-Python/OpenRTM_aist/CorbaConsumer.py
===================================================================
--- trunk/OpenRTM-aist-Python/OpenRTM_aist/CorbaConsumer.py	2017-01-12 08:15:07 UTC (rev 774)
+++ trunk/OpenRTM-aist-Python/OpenRTM_aist/CorbaConsumer.py	2017-01-12 10:13:00 UTC (rev 775)
@@ -285,14 +285,14 @@
       self._var = self._objref
     
     
+    return True
+    #if not CORBA.is_nil(self._var):
+    #  return True
 
-    if not CORBA.is_nil(self._var):
-      return True
+    #self.releaseObject()
+    #return False
 
-    self.releaseObject()
-    return False
 
-
   ##
   # @if jp
   # @brief ObjectType 型のオブジェクトのリファレンスを取得
@@ -326,14 +326,12 @@
     try:
       mgr = OpenRTM_aist.Manager.instance()
       self._sev = mgr._poa.reference_to_servant(self._var)
-      if self._sev is not None:
-        return self._sev
+      return self._sev
     except:
       return self._var
-      
-    return self._var
 
 
+
   ##
   # @if jp
   #

Modified: trunk/OpenRTM-aist-Python/OpenRTM_aist/InPortBase.py
===================================================================
--- trunk/OpenRTM-aist-Python/OpenRTM_aist/InPortBase.py	2017-01-12 08:15:07 UTC (rev 774)
+++ trunk/OpenRTM-aist-Python/OpenRTM_aist/InPortBase.py	2017-01-12 10:13:00 UTC (rev 775)
@@ -1209,9 +1209,9 @@
         return 0
                 
 
-      if connector is None:
-        self._rtcout.RTC_ERROR("InPortConnector creation failed")
-        return 0
+      #if connector is None:
+      #  self._rtcout.RTC_ERROR("InPortConnector creation failed")
+      #  return 0
 
       if provider_ is not None:
         self._rtcout.RTC_TRACE("InPortPushConnector created")