[openrtm-commit:00640] r2288 - trunk/OpenRTM-aist/src/lib/rtm

[openrtm ＠ openrtm.org]

Author: n-ando
Date: 2012-02-03 11:19:07 +0900 (Fri, 03 Feb 2012)
New Revision: 2288

Modified:
   trunk/OpenRTM-aist/src/lib/rtm/RTObject.cpp
Log:
[compat,impl,bugfix] Now re-enter to exit() function is checked. refs #2334

Modified: trunk/OpenRTM-aist/src/lib/rtm/RTObject.cpp
===================================================================
--- trunk/OpenRTM-aist/src/lib/rtm/RTObject.cpp	2012-02-03 00:32:28 UTC (rev 2287)
+++ trunk/OpenRTM-aist/src/lib/rtm/RTObject.cpp	2012-02-03 02:19:07 UTC (rev 2288)
@@ -418,6 +418,7 @@
   {
     RTC_TRACE(("exit()"));
     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,