[openrtm-commit:01769] r669 - trunk/OpenRTM-aist-Python/OpenRTM_aist

[openrtm ＠ openrtm.org]

Author: miyamoto
Date: 2016-02-27 10:35:26 +0900 (Sat, 27 Feb 2016)
New Revision: 669

Modified:
   trunk/OpenRTM-aist-Python/OpenRTM_aist/OutPortBase.py
   trunk/OpenRTM-aist-Python/OpenRTM_aist/OutPortPullConnector.py
Log:
[incompat,bugfix,func,->RELENG_1_2] bug fix. refs #3407

Modified: trunk/OpenRTM-aist-Python/OpenRTM_aist/OutPortBase.py
===================================================================
--- trunk/OpenRTM-aist-Python/OpenRTM_aist/OutPortBase.py	2016-02-27 01:34:20 UTC (rev 668)
+++ trunk/OpenRTM-aist-Python/OpenRTM_aist/OutPortBase.py	2016-02-27 01:35:26 UTC (rev 669)
@@ -1242,10 +1242,8 @@
           self._rtcout.RTC_TRACE("but a peer InPort servant could not be obtained.")
           del connector
           return 0
-        if consumer_ is not None:
-          connector.setInPort(inport)
-        elif provider_ is not None:
-          connector.setPorts(inport, self)
+
+        connector.setInPort(inport)
         #if consumer_ is not None:
         #  connector.setInPort(inport)
         #elif provider_ is not None:

Modified: trunk/OpenRTM-aist-Python/OpenRTM_aist/OutPortPullConnector.py
===================================================================
--- trunk/OpenRTM-aist-Python/OpenRTM_aist/OutPortPullConnector.py	2016-02-27 01:34:20 UTC (rev 668)
+++ trunk/OpenRTM-aist-Python/OpenRTM_aist/OutPortPullConnector.py	2016-02-27 01:35:26 UTC (rev 669)
@@ -356,12 +356,12 @@
   # @endif
   #
   # bool setPorts(InPortBase* directInPort, OutPortBase* outPort);
-  def setPorts(self, directInPort, outPort):
+  def setInPort(self, directInPort):
     if self._directInPort is not None:
       return False
     self._directInPort = directInPort
     self._inPortListeners = self._directInPort._listeners
-    self._outPortListeners = outPort._listeners
+    
     self._directInPort.addOutPortConnector(self)
     return True
 
@@ -383,7 +383,7 @@
   def read(self):
     guard = OpenRTM_aist.ScopedLock(self._valueMutex)
     if not self.isNew():
-        self._outPortListeners.connector_[OpenRTM_aist.ConnectorListenerType.ON_BUFFER_EMPTY].notify(self._profile)
+        self._listeners.connector_[OpenRTM_aist.ConnectorListenerType.ON_BUFFER_EMPTY].notify(self._profile)
         self._inPortListeners.connector_[OpenRTM_aist.ConnectorListenerType.ON_SENDER_EMPTY].notify(self._profile)
         self._rtcout.RTC_TRACE("ON_BUFFER_EMPTY(OutPort), ")
         self._rtcout.RTC_TRACE("ON_SENDER_EMPTY(InPort) ")
@@ -396,10 +396,10 @@
     del guard
     
     
-    self._outPortListeners.connectorData_[OpenRTM_aist.ConnectorDataListenerType.ON_BUFFER_READ].notify(self._profile, data)
+    self._listeners.connectorData_[OpenRTM_aist.ConnectorDataListenerType.ON_BUFFER_READ].notify(self._profile, data)
     self._rtcout.RTC_TRACE("ON_BUFFER_READ(OutPort), ")
     self._rtcout.RTC_TRACE("callback called in direct mode.")
-    self._outPortListeners.connectorData_[OpenRTM_aist.ConnectorDataListenerType.ON_SEND].notify(self._profile, data)
+    self._listeners.connectorData_[OpenRTM_aist.ConnectorDataListenerType.ON_SEND].notify(self._profile, data)
     self._rtcout.RTC_TRACE("ON_SEND(OutPort), ")
     self._rtcout.RTC_TRACE("callback called in direct mode.")
     self._inPortListeners.connectorData_[OpenRTM_aist.ConnectorDataListenerType.ON_RECEIVED].notify(self._profile, data)