[openrtm-commit:01789] r680 - trunk/OpenRTM-aist-Python/OpenRTM_aist

[openrtm ＠ openrtm.org]

Author: miyamoto
Date: 2016-02-29 22:11:43 +0900 (Mon, 29 Feb 2016)
New Revision: 680

Modified:
   trunk/OpenRTM-aist-Python/OpenRTM_aist/InPortCorbaCdrProvider.py
   trunk/OpenRTM-aist-Python/OpenRTM_aist/InPortSHMConsumer.py
   trunk/OpenRTM-aist-Python/OpenRTM_aist/InPortSHMProvider.py
   trunk/OpenRTM-aist-Python/OpenRTM_aist/OutPortSHMConsumer.py
Log:
[compat,bugfix,->RELENG_1_2] bug fix. refs #3410

Modified: trunk/OpenRTM-aist-Python/OpenRTM_aist/InPortCorbaCdrProvider.py
===================================================================
--- trunk/OpenRTM-aist-Python/OpenRTM_aist/InPortCorbaCdrProvider.py	2016-02-29 03:21:18 UTC (rev 679)
+++ trunk/OpenRTM-aist-Python/OpenRTM_aist/InPortCorbaCdrProvider.py	2016-02-29 13:11:43 UTC (rev 680)
@@ -116,8 +116,8 @@
   # @endif
   #
   def __del__(self):
-    oid = OpenRTM_aist.Manager.instance().getPOA.servant_to_id(self)
-    OpenRTM_aist.Manager.instance().getPOA.deactivate_object(oid)
+    oid = OpenRTM_aist.Manager.instance().getPOA().servant_to_id(self)
+    OpenRTM_aist.Manager.instance().getPOA().deactivate_object(oid)
     return
 
   ## virtual void init(coil::Properties& prop);

Modified: trunk/OpenRTM-aist-Python/OpenRTM_aist/InPortSHMConsumer.py
===================================================================
--- trunk/OpenRTM-aist-Python/OpenRTM_aist/InPortSHMConsumer.py	2016-02-29 03:21:18 UTC (rev 679)
+++ trunk/OpenRTM-aist-Python/OpenRTM_aist/InPortSHMConsumer.py	2016-02-29 13:11:43 UTC (rev 680)
@@ -96,6 +96,9 @@
     CorbaConsumer.__del__(self)
     self._shmem.close_memory(True)
     
+    oid = OpenRTM_aist.Manager.instance().getPOA().servant_to_id(self._shmem)
+    OpenRTM_aist.Manager.instance().getPOA().deactivate_object(oid)
+    
     return
 
   ##

Modified: trunk/OpenRTM-aist-Python/OpenRTM_aist/InPortSHMProvider.py
===================================================================
--- trunk/OpenRTM-aist-Python/OpenRTM_aist/InPortSHMProvider.py	2016-02-29 03:21:18 UTC (rev 679)
+++ trunk/OpenRTM-aist-Python/OpenRTM_aist/InPortSHMProvider.py	2016-02-29 13:11:43 UTC (rev 680)
@@ -101,8 +101,8 @@
   # @endif
   #
   def __del__(self):
-    oid = OpenRTM_aist.Manager.instance().getPOA.servant_to_id(self)
-    OpenRTM_aist.Manager.instance().getPOA.deactivate_object(oid)
+    oid = OpenRTM_aist.Manager.instance().getPOA().servant_to_id(self)
+    OpenRTM_aist.Manager.instance().getPOA().deactivate_object(oid)
     
       
       

Modified: trunk/OpenRTM-aist-Python/OpenRTM_aist/OutPortSHMConsumer.py
===================================================================
--- trunk/OpenRTM-aist-Python/OpenRTM_aist/OutPortSHMConsumer.py	2016-02-29 03:21:18 UTC (rev 679)
+++ trunk/OpenRTM-aist-Python/OpenRTM_aist/OutPortSHMConsumer.py	2016-02-29 13:11:43 UTC (rev 680)
@@ -81,6 +81,9 @@
     CorbaConsumer.__del__(self)
     if self._outportcdr:
       self._outportcdr.close_memory(True)
+    oid = OpenRTM_aist.Manager.instance().getPOA().servant_to_id(self._shmem)
+    OpenRTM_aist.Manager.instance().getPOA().deactivate_object(oid)
+