[openrtm-commit:03263] r964 - branches/RELENG_1_2/OpenRTM-aist-Python/OpenRTM_aist

[openrtm ＠ openrtm.org]

Author: miyamoto
Date: 2018-03-22 09:10:18 +0900 (Thu, 22 Mar 2018)
New Revision: 964

Modified:
   branches/RELENG_1_2/OpenRTM-aist-Python/OpenRTM_aist/PortAdmin.py
   branches/RELENG_1_2/OpenRTM-aist-Python/OpenRTM_aist/PortBase.py
Log:
[merge] r962-963 have been merged from trunk.

Modified: branches/RELENG_1_2/OpenRTM-aist-Python/OpenRTM_aist/PortAdmin.py
===================================================================
--- branches/RELENG_1_2/OpenRTM-aist-Python/OpenRTM_aist/PortAdmin.py	2018-03-22 00:08:03 UTC (rev 963)
+++ branches/RELENG_1_2/OpenRTM-aist-Python/OpenRTM_aist/PortAdmin.py	2018-03-22 00:10:18 UTC (rev 964)
@@ -438,7 +438,6 @@
   # @endif
   def finalizePorts(self):
     self.deactivatePorts()
-    ports = []
     ports = self._portServants.getObjects()
     len_ = len(ports)
     for i in range(len_):

Modified: branches/RELENG_1_2/OpenRTM-aist-Python/OpenRTM_aist/PortBase.py
===================================================================
--- branches/RELENG_1_2/OpenRTM-aist-Python/OpenRTM_aist/PortBase.py	2018-03-22 00:08:03 UTC (rev 963)
+++ branches/RELENG_1_2/OpenRTM-aist-Python/OpenRTM_aist/PortBase.py	2018-03-22 00:10:18 UTC (rev 964)
@@ -210,12 +210,12 @@
   #
   def exit(self):
     self._rtcout.RTC_TRACE("PortBase.__del__()")
-    try:
-      poa = OpenRTM_aist.Manager.instance().getPOA()
-      oid = poa.servant_to_id(self)
-      poa.deactivate_object(oid)
-    except:
-      self._rtcout.RTC_ERROR(OpenRTM_aist.Logger.print_exception())
+    #try:
+    #  poa = OpenRTM_aist.Manager.instance().getPOA()
+    #  oid = poa.servant_to_id(self)
+    #  poa.deactivate_object(oid)
+    #except:
+    #  self._rtcout.RTC_ERROR(OpenRTM_aist.Logger.print_exception())
 
   ##
   # @if jp