[openrtm-commit:00683] r2324 - trunk/OpenRTM-aist/src/lib/rtm

[openrtm ＠ openrtm.org]

Author: kurihara
Date: 2012-02-08 13:37:28 +0900 (Wed, 08 Feb 2012)
New Revision: 2324

Modified:
   trunk/OpenRTM-aist/src/lib/rtm/ExecutionContextBase.cpp
   trunk/OpenRTM-aist/src/lib/rtm/ExecutionContextWorker.cpp
   trunk/OpenRTM-aist/src/lib/rtm/ExecutionContextWorker.h
Log:
-getStateString()'s bug was fixed.
-Log messages have been corrected.

Modified: trunk/OpenRTM-aist/src/lib/rtm/ExecutionContextBase.cpp
===================================================================
--- trunk/OpenRTM-aist/src/lib/rtm/ExecutionContextBase.cpp	2012-02-08 02:01:08 UTC (rev 2323)
+++ trunk/OpenRTM-aist/src/lib/rtm/ExecutionContextBase.cpp	2012-02-08 04:37:28 UTC (rev 2324)
@@ -170,7 +170,7 @@
    */
   RTC::ReturnCode_t ExecutionContextBase::stop()
   {
-    RTC_TRACE(("start()"));
+    RTC_TRACE(("stop()"));
     RTC::ReturnCode_t ret = onStopping(); // Template
     if (ret != RTC::RTC_OK)
       {

Modified: trunk/OpenRTM-aist/src/lib/rtm/ExecutionContextWorker.cpp
===================================================================
--- trunk/OpenRTM-aist/src/lib/rtm/ExecutionContextWorker.cpp	2012-02-08 02:01:08 UTC (rev 2323)
+++ trunk/OpenRTM-aist/src/lib/rtm/ExecutionContextWorker.cpp	2012-02-08 04:37:28 UTC (rev 2324)
@@ -77,7 +77,7 @@
    */
   CORBA::Boolean ExecutionContextWorker::isRunning()
   {
-    RTC_TRACE(("is_running()"));
+    RTC_TRACE(("isRunning()"));
     return m_running;
   }
   

Modified: trunk/OpenRTM-aist/src/lib/rtm/ExecutionContextWorker.h
===================================================================
--- trunk/OpenRTM-aist/src/lib/rtm/ExecutionContextWorker.h	2012-02-08 02:01:08 UTC (rev 2323)
+++ trunk/OpenRTM-aist/src/lib/rtm/ExecutionContextWorker.h	2012-02-08 04:37:28 UTC (rev 2324)
@@ -345,7 +345,7 @@
         "ACTIVE_STATE",
         "ERROR_STATE"
       };
-      return state >= RTC::CREATED_STATE || state <= RTC::ERROR_STATE ?
+      return state >= RTC::CREATED_STATE && state <= RTC::ERROR_STATE ?
         st[state] : "";
     }
     /*!