[openrtm-commit:02151] r764 - trunk/OpenRTM-aist-Python/OpenRTM_aist

[openrtm ＠ openrtm.org]

Author: miyamoto
Date: 2016-12-01 13:24:01 +0900 (Thu, 01 Dec 2016)
New Revision: 764

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

Modified: trunk/OpenRTM-aist-Python/OpenRTM_aist/InPortBase.py
===================================================================
--- trunk/OpenRTM-aist-Python/OpenRTM_aist/InPortBase.py	2016-11-30 04:41:49 UTC (rev 763)
+++ trunk/OpenRTM-aist-Python/OpenRTM_aist/InPortBase.py	2016-12-01 04:24:01 UTC (rev 764)
@@ -1227,5 +1227,4 @@
       self._rtcout.RTC_ERROR(OpenRTM_aist.Logger.print_exception())
       return 0
 
-    self._rtcout.RTC_FATAL("never comes here: createConnector()")
-    return 0
+

Modified: trunk/OpenRTM-aist-Python/OpenRTM_aist/OutPortBase.py
===================================================================
--- trunk/OpenRTM-aist-Python/OpenRTM_aist/OutPortBase.py	2016-11-30 04:41:49 UTC (rev 763)
+++ trunk/OpenRTM-aist-Python/OpenRTM_aist/OutPortBase.py	2016-12-01 04:24:01 UTC (rev 764)
@@ -1260,10 +1260,9 @@
       return 0
 
 
-    self._rtcout.RTC_FATAL("never comes here: createConnector()")
-    return 0
 
 
+
   ##
   # @if jp
   # @brief ローカルのピアInPortを取得

Modified: trunk/OpenRTM-aist-Python/OpenRTM_aist/OutPortCorbaCdrConsumer.py
===================================================================
--- trunk/OpenRTM-aist-Python/OpenRTM_aist/OutPortCorbaCdrConsumer.py	2016-11-30 04:41:49 UTC (rev 763)
+++ trunk/OpenRTM-aist-Python/OpenRTM_aist/OutPortCorbaCdrConsumer.py	2016-12-01 04:24:01 UTC (rev 764)
@@ -222,10 +222,9 @@
       self._rtcout.RTC_ERROR(OpenRTM_aist.Logger.print_exception())
       return self.CONNECTION_LOST
 
-    self._rtcout.RTC_ERROR("get(): Never comes here.")
-    return self.UNKNOWN_ERROR
 
 
+
   ##
   # @if jp
   # @brief データ受信通知への登録
@@ -299,15 +298,16 @@
   def unsubscribeInterface(self, properties):
     self._rtcout.RTC_TRACE("unsubscribeInterface()")
     index = OpenRTM_aist.NVUtil.find_index(properties,
-                                           "dataport.corba_cdr.outport_ref")
+                                           "dataport.corba_cdr.outport_ior")
     if index < 0:
       self._rtcout.RTC_DEBUG("dataport.corba_cdr.outport_ior not found.")
       return
     
     ior = ""
+    
     try:
       ior = any.from_any(properties[index].value, keep_structs=True)
-                
+             
       if ior:
         self._rtcout.RTC_DEBUG("dataport.corba_cdr.outport_ior found.")
         orb = OpenRTM_aist.Manager.instance().getORB()

Modified: trunk/OpenRTM-aist-Python/OpenRTM_aist/PortBase.py
===================================================================
--- trunk/OpenRTM-aist-Python/OpenRTM_aist/PortBase.py	2016-11-30 04:41:49 UTC (rev 763)
+++ trunk/OpenRTM-aist-Python/OpenRTM_aist/PortBase.py	2016-12-01 04:24:01 UTC (rev 764)
@@ -566,9 +566,9 @@
       self._rtcout.RTC_ERROR(OpenRTM_aist.Logger.print_exception())
       return (RTC.BAD_PARAMETER, connector_profile)
 
-    return (RTC.RTC_ERROR, connector_profile)
 
 
+
   ##
   # @if jp
   #