[openrtm-commit:00306] r2214 - in branches/RELENG_1_1/OpenRTM-aist: . src/lib/coil/common

[openrtm ＠ openrtm.org]

Author: n-ando
Date: 2011-08-03 18:05:49 +0900 (Wed, 03 Aug 2011)
New Revision: 2214

Modified:
   branches/RELENG_1_1/OpenRTM-aist/
   branches/RELENG_1_1/OpenRTM-aist/src/lib/coil/common/Timer.cpp
Log:
merged from trunk r2212:2213


Property changes on: branches/RELENG_1_1/OpenRTM-aist
___________________________________________________________________
Modified: svn:mergeinfo
   - /tags/RELEASE_1_1_0_RC2/OpenRTM-aist:2173
/trunk/OpenRTM-aist:2154-2172,2174-2176,2180,2183-2208
   + /tags/RELEASE_1_1_0_RC2/OpenRTM-aist:2173
/trunk/OpenRTM-aist:2154-2172,2174-2176,2180,2183-2208,2213

Modified: branches/RELENG_1_1/OpenRTM-aist/src/lib/coil/common/Timer.cpp
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist/src/lib/coil/common/Timer.cpp	2011-08-03 08:59:33 UTC (rev 2213)
+++ branches/RELENG_1_1/OpenRTM-aist/src/lib/coil/common/Timer.cpp	2011-08-03 09:05:49 UTC (rev 2214)
@@ -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;