[openrtm-commit:00325] r2215 - in tags/RELEASE_1_1_0_RC3/OpenRTM-aist: . src/ext src/lib/coil/common

[openrtm ＠ openrtm.org]

Author: n-ando
Date: 2011-08-08 19:46:40 +0900 (Mon, 08 Aug 2011)
New Revision: 2215

Modified:
   tags/RELEASE_1_1_0_RC3/OpenRTM-aist/
   tags/RELEASE_1_1_0_RC3/OpenRTM-aist/src/ext/
   tags/RELEASE_1_1_0_RC3/OpenRTM-aist/src/lib/coil/common/Timer.cpp
Log:
merged from trunk r2212:2213


Property changes on: tags/RELEASE_1_1_0_RC3/OpenRTM-aist
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/RELENG_1_1/OpenRTM-aist:2126-2150
/trunk/OpenRTM-aist:2208-2210
   + /branches/RELENG_1_1/OpenRTM-aist:2126-2150
/trunk/OpenRTM-aist:2208-2210,2213


Property changes on: tags/RELEASE_1_1_0_RC3/OpenRTM-aist/src/ext
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/RELENG_1_1/OpenRTM-aist/src/ext:2126-2150,2178
/trunk/OpenRTM-aist/src/ext:2208-2210
   + /branches/RELENG_1_1/OpenRTM-aist/src/ext:2126-2150,2178
/trunk/OpenRTM-aist/src/ext:2208-2210,2213

Modified: tags/RELEASE_1_1_0_RC3/OpenRTM-aist/src/lib/coil/common/Timer.cpp
===================================================================
--- tags/RELEASE_1_1_0_RC3/OpenRTM-aist/src/lib/coil/common/Timer.cpp	2011-08-03 09:05:49 UTC (rev 2214)
+++ tags/RELEASE_1_1_0_RC3/OpenRTM-aist/src/lib/coil/common/Timer.cpp	2011-08-08 10:46:40 UTC (rev 2215)
@@ -119,6 +119,7 @@
    */
   void Timer::invoke()
   {
+    Guard guard(m_taskMutex);
     for (size_t i(0), len(m_tasks.size()); i < len; ++i)
       {
 	m_tasks[i].remains = m_tasks[i].remains - m_interval;