[openrtm-commit:00639] r2287 - branches/RELENG_1_1/OpenRTM-aist/src/lib/rtm

[openrtm ＠ openrtm.org]

Author: n-ando
Date: 2012-02-03 09:32:28 +0900 (Fri, 03 Feb 2012)
New Revision: 2287

Modified:
   branches/RELENG_1_1/OpenRTM-aist/src/lib/rtm/RTObject.cpp
Log:
Exiting state check has been added to exit() function.

Modified: branches/RELENG_1_1/OpenRTM-aist/src/lib/rtm/RTObject.cpp
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist/src/lib/rtm/RTObject.cpp	2012-02-02 08:03:35 UTC (rev 2286)
+++ branches/RELENG_1_1/OpenRTM-aist/src/lib/rtm/RTObject.cpp	2012-02-03 00:32:28 UTC (rev 2287)
@@ -395,7 +395,8 @@
     throw (CORBA::SystemException)
   {
     RTC_TRACE(("exit()"));
-    if (m_created) return RTC::PRECONDITION_NOT_MET;
+    if (m_created) { return RTC::PRECONDITION_NOT_MET; }
+    if (m_exiting) { return RTC::RTC_OK; }
 
     // deactivate myself on owned EC
     CORBA_SeqUtil::for_each(m_ecMine,