[openrtm-commit:00643] r511 - trunk/OpenRTM-aist-Python/OpenRTM_aist

openrtm @ openrtm.org openrtm @ openrtm.org
2012年 2月 3日 (金) 11:40:29 JST


Author: kurihara
Date: 2012-02-03 11:40:29 +0900 (Fri, 03 Feb 2012)
New Revision: 511

Modified:
   trunk/OpenRTM-aist-Python/OpenRTM_aist/RTObject.py
Log:
[compat,impl,bugfix] Now re-enter to exit() function is checked. refs #2336

Modified: trunk/OpenRTM-aist-Python/OpenRTM_aist/RTObject.py
===================================================================
--- trunk/OpenRTM-aist-Python/OpenRTM_aist/RTObject.py	2012-02-02 01:30:19 UTC (rev 510)
+++ trunk/OpenRTM-aist-Python/OpenRTM_aist/RTObject.py	2012-02-03 02:40:29 UTC (rev 511)
@@ -634,6 +634,8 @@
     self._rtcout.RTC_TRACE("exit()")
     if self._created:
       return RTC.PRECONDITION_NOT_MET
+    if self._exiting:
+      return RTC.RTC_OK
 
     # deactivate myself on owned EC
     OpenRTM_aist.CORBA_SeqUtil.for_each(self._ecMine,



openrtm-commit メーリングリストの案内