[openrtm-commit:00644] r512 - branches/work/OpenRTM-aist-Python/OpenRTM_aist

[openrtm ＠ openrtm.org]

Author: kurihara
Date: 2012-02-03 13:21:43 +0900 (Fri, 03 Feb 2012)
New Revision: 512

Modified:
   branches/work/OpenRTM-aist-Python/OpenRTM_aist/
   branches/work/OpenRTM-aist-Python/OpenRTM_aist/ManagerConfig.py
   branches/work/OpenRTM-aist-Python/OpenRTM_aist/RTObject.py
   branches/work/OpenRTM-aist-Python/OpenRTM_aist/SystemLogger.py
Log:
merged r511


Property changes on: branches/work/OpenRTM-aist-Python/OpenRTM_aist
___________________________________________________________________
Added: svn:mergeinfo
   + /branches/RELENG_1_0/OpenRTM-aist-Python/OpenRTM_aist:345-404
/branches/RELENG_1_1/OpenRTM-aist-Python/OpenRTM_aist:396-478,495
/trunk/OpenRTM-aist-Python/OpenRTM_aist:511


Property changes on: branches/work/OpenRTM-aist-Python/OpenRTM_aist/ManagerConfig.py
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/RELENG_1_0/OpenRTM-aist-Python/OpenRTM_aist/ManagerConfig.py:345-395
/branches/RELENG_1_1/OpenRTM-aist-Python/OpenRTM_aist/ManagerConfig.py:396-478,495
   + /branches/RELENG_1_0/OpenRTM-aist-Python/OpenRTM_aist/ManagerConfig.py:345-395
/branches/RELENG_1_1/OpenRTM-aist-Python/OpenRTM_aist/ManagerConfig.py:396-478,495
/trunk/OpenRTM-aist-Python/OpenRTM_aist/ManagerConfig.py:511

Modified: branches/work/OpenRTM-aist-Python/OpenRTM_aist/RTObject.py
===================================================================
--- branches/work/OpenRTM-aist-Python/OpenRTM_aist/RTObject.py	2012-02-03 02:40:29 UTC (rev 511)
+++ branches/work/OpenRTM-aist-Python/OpenRTM_aist/RTObject.py	2012-02-03 04:21:43 UTC (rev 512)
@@ -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,


Property changes on: branches/work/OpenRTM-aist-Python/OpenRTM_aist/SystemLogger.py
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/RELENG_1_0/OpenRTM-aist-Python/OpenRTM_aist/SystemLogger.py:345-395
/branches/RELENG_1_1/OpenRTM-aist-Python/OpenRTM_aist/SystemLogger.py:396-478,495
   + /branches/RELENG_1_0/OpenRTM-aist-Python/OpenRTM_aist/SystemLogger.py:345-395
/branches/RELENG_1_1/OpenRTM-aist-Python/OpenRTM_aist/SystemLogger.py:396-478,495
/trunk/OpenRTM-aist-Python/OpenRTM_aist/SystemLogger.py:511