[openrtm-commit:00419] r480 - branches/RELENG_1_1/OpenRTM-aist-Python/OpenRTM_aist

[openrtm ＠ openrtm.org]

Author: kurihara
Date: 2011-09-21 18:16:22 +0900 (Wed, 21 Sep 2011)
New Revision: 480

Modified:
   branches/RELENG_1_1/OpenRTM-aist-Python/OpenRTM_aist/InPortBase.py
   branches/RELENG_1_1/OpenRTM-aist-Python/OpenRTM_aist/InPortPullConnector.py
   branches/RELENG_1_1/OpenRTM-aist-Python/OpenRTM_aist/InPortPushConnector.py
   branches/RELENG_1_1/OpenRTM-aist-Python/OpenRTM_aist/OutPortBase.py
   branches/RELENG_1_1/OpenRTM-aist-Python/OpenRTM_aist/OutPortPullConnector.py
   branches/RELENG_1_1/OpenRTM-aist-Python/OpenRTM_aist/OutPortPushConnector.py
Log:
Fixed a problem that does not call the InPortPushConnector.disconnect(). refs #2237

Modified: branches/RELENG_1_1/OpenRTM-aist-Python/OpenRTM_aist/InPortBase.py
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist-Python/OpenRTM_aist/InPortBase.py	2011-09-21 07:57:38 UTC (rev 479)
+++ branches/RELENG_1_1/OpenRTM-aist-Python/OpenRTM_aist/InPortBase.py	2011-09-21 09:16:22 UTC (rev 480)
@@ -986,6 +986,7 @@
       if id == self._connectors[idx].id():
         # Connector's dtor must call disconnect()
         self._connectors[idx].deactivate()
+        self._connectors[idx].disconnect()
         del self._connectors[idx]
         self._rtcout.RTC_TRACE("delete connector: %s", id)
         return

Modified: branches/RELENG_1_1/OpenRTM-aist-Python/OpenRTM_aist/InPortPullConnector.py
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist-Python/OpenRTM_aist/InPortPullConnector.py	2011-09-21 07:57:38 UTC (rev 479)
+++ branches/RELENG_1_1/OpenRTM-aist-Python/OpenRTM_aist/InPortPullConnector.py	2011-09-21 09:16:22 UTC (rev 480)
@@ -157,8 +157,6 @@
   # @endif
   #
   def __del__(self):
-    self.onDisconnect()
-    self.disconnect()
     return
 
 
@@ -230,6 +228,7 @@
   # virtual ReturnCode disconnect();
   def disconnect(self):
     self._rtcout.RTC_TRACE("disconnect()")
+    self.onDisconnect()
     # delete consumer
     if self._consumer:
       OpenRTM_aist.OutPortConsumerFactory.instance().deleteObject(self._consumer)

Modified: branches/RELENG_1_1/OpenRTM-aist-Python/OpenRTM_aist/InPortPushConnector.py
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist-Python/OpenRTM_aist/InPortPushConnector.py	2011-09-21 07:57:38 UTC (rev 479)
+++ branches/RELENG_1_1/OpenRTM-aist-Python/OpenRTM_aist/InPortPushConnector.py	2011-09-21 09:16:22 UTC (rev 480)
@@ -160,8 +160,6 @@
   # @endif
   #
   def __del__(self):
-    self.onDisconnect()
-    self.disconnect()
     return
 
 
@@ -255,6 +253,7 @@
   # virtual ReturnCode disconnect();
   def disconnect(self):
     self._rtcout.RTC_TRACE("disconnect()")
+    self.onDisconnect()
     # delete consumer
     if self._provider:
       cfactory = OpenRTM_aist.InPortProviderFactory.instance()

Modified: branches/RELENG_1_1/OpenRTM-aist-Python/OpenRTM_aist/OutPortBase.py
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist-Python/OpenRTM_aist/OutPortBase.py	2011-09-21 07:57:38 UTC (rev 479)
+++ branches/RELENG_1_1/OpenRTM-aist-Python/OpenRTM_aist/OutPortBase.py	2011-09-21 09:16:22 UTC (rev 480)
@@ -1028,6 +1028,7 @@
       if id == self._connectors[idx].id():
         # Connector's dtor must call disconnect()
         self._connectors[idx].deactivate()
+        self._connectors[idx].disconnect()
         del self._connectors[idx]
         self._rtcout.RTC_TRACE("delete connector: %s", id)
         return

Modified: branches/RELENG_1_1/OpenRTM-aist-Python/OpenRTM_aist/OutPortPullConnector.py
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist-Python/OpenRTM_aist/OutPortPullConnector.py	2011-09-21 07:57:38 UTC (rev 479)
+++ branches/RELENG_1_1/OpenRTM-aist-Python/OpenRTM_aist/OutPortPullConnector.py	2011-09-21 09:16:22 UTC (rev 480)
@@ -159,8 +159,6 @@
   # @endif
   #
   def __del__(self):
-    self.onDisConnect()
-    self.disconnect()
     return
 
 
@@ -212,6 +210,7 @@
   # virtual ReturnCode disconnect();
   def disconnect(self):
     self._rtcout.RTC_TRACE("disconnect()")
+    self.onDisConnect()
     # delete provider
     if self._provider:
       OpenRTM_aist.OutPortProviderFactory.instance().deleteObject(self._provider)

Modified: branches/RELENG_1_1/OpenRTM-aist-Python/OpenRTM_aist/OutPortPushConnector.py
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist-Python/OpenRTM_aist/OutPortPushConnector.py	2011-09-21 07:57:38 UTC (rev 479)
+++ branches/RELENG_1_1/OpenRTM-aist-Python/OpenRTM_aist/OutPortPushConnector.py	2011-09-21 09:16:22 UTC (rev 480)
@@ -188,8 +188,6 @@
   # @endif
   #
   def __del__(self):
-    self.onDisconnect()
-    self.disconnect()
     return
 
   ##
@@ -265,6 +263,7 @@
   # virtual ReturnCode disconnect();
   def disconnect(self):
     self._rtcout.RTC_TRACE("disconnect()")
+    self.onDisconnect()
     # delete publisher
     if self._publisher:
       self._rtcout.RTC_DEBUG("delete publisher")