[openrtm-commit:03200] r949 - in trunk/OpenRTM-aist-Python/OpenRTM_aist: . ext/sdo/observer

[openrtm ＠ openrtm.org]

Author: miyamoto
Date: 2018-02-28 09:38:29 +0900 (Wed, 28 Feb 2018)
New Revision: 949

Modified:
   trunk/OpenRTM-aist-Python/OpenRTM_aist/PortAdmin.py
   trunk/OpenRTM-aist-Python/OpenRTM_aist/PortBase.py
   trunk/OpenRTM-aist-Python/OpenRTM_aist/ext/sdo/observer/ComponentObserverConsumer.py
Log:
[bugfix, ->trunk] bug fixed. 

Modified: trunk/OpenRTM-aist-Python/OpenRTM_aist/PortAdmin.py
===================================================================
--- trunk/OpenRTM-aist-Python/OpenRTM_aist/PortAdmin.py	2018-02-27 08:40:41 UTC (rev 948)
+++ trunk/OpenRTM-aist-Python/OpenRTM_aist/PortAdmin.py	2018-02-28 00:38:29 UTC (rev 949)
@@ -443,4 +443,5 @@
     len_ = len(ports)
     for i in range(len_):
       idx = (len_ - 1) - i
+      ports[idx].exit()
       self.removePort(ports[idx])

Modified: trunk/OpenRTM-aist-Python/OpenRTM_aist/PortBase.py
===================================================================
--- trunk/OpenRTM-aist-Python/OpenRTM_aist/PortBase.py	2018-02-27 08:40:41 UTC (rev 948)
+++ trunk/OpenRTM-aist-Python/OpenRTM_aist/PortBase.py	2018-02-28 00:38:29 UTC (rev 949)
@@ -190,6 +190,25 @@
   # @endif
   #
   def __del__(self):
+    pass
+    
+
+  ##
+  # @if jp
+  #
+  # @brief ½ªÎ»´Ø¿ô
+  #
+  # @param self 
+  #
+  # @else
+  #
+  # @brief 
+  #
+  # @param self 
+  #
+  # @endif
+  #
+  def exit(self):
     self._rtcout.RTC_TRACE("PortBase.__del__()")
     try:
       poa = OpenRTM_aist.Manager.instance().getPOA()
@@ -197,7 +216,6 @@
       poa.deactivate_object(oid)
     except:
       self._rtcout.RTC_ERROR(OpenRTM_aist.Logger.print_exception())
-    
 
   ##
   # @if jp

Modified: trunk/OpenRTM-aist-Python/OpenRTM_aist/ext/sdo/observer/ComponentObserverConsumer.py
===================================================================
--- trunk/OpenRTM-aist-Python/OpenRTM_aist/ext/sdo/observer/ComponentObserverConsumer.py	2018-02-27 08:40:41 UTC (rev 948)
+++ trunk/OpenRTM-aist-Python/OpenRTM_aist/ext/sdo/observer/ComponentObserverConsumer.py	2018-02-28 00:38:29 UTC (rev 949)
@@ -66,13 +66,6 @@
   # @endif
   #
   def __del__(self):
-    self.unsetComponentProfileListeners()
-    self.unsetComponentStatusListeners()
-    self.unsetPortProfileListeners()
-    self.unsetExecutionContextListeners()
-    self.unsetConfigurationListeners()
-    self.unsetHeartbeat()
-    del self._timer
     return
 
 
@@ -150,6 +143,8 @@
     self.unsetExecutionContextListeners()
     self.unsetConfigurationListeners()
     self.unsetHeartbeat()
+
+    del self._timer
     return