[openrtm-commit:01987] r2755 - branches/RELENG_1_1/OpenRTM-aist/src/lib/rtm

[openrtm ＠ openrtm.org]

Author: n-ando
Date: 2016-06-11 16:31:16 +0900 (Sat, 11 Jun 2016)
New Revision: 2755

Modified:
   branches/RELENG_1_1/OpenRTM-aist/src/lib/rtm/OutPort.h
Log:
merged r2753-2754

Modified: branches/RELENG_1_1/OpenRTM-aist/src/lib/rtm/OutPort.h
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist/src/lib/rtm/OutPort.h	2016-06-07 04:18:33 UTC (rev 2754)
+++ branches/RELENG_1_1/OpenRTM-aist/src/lib/rtm/OutPort.h	2016-06-11 07:31:16 UTC (rev 2755)
@@ -139,7 +139,11 @@
         m_value(value), m_onWrite(0), m_onWriteConvert(0)
     {
       addProperty("dataport.data_value", CORBA::Short(0));
-      m_propValueIndex = NVUtil::find_index(m_profile.properties, "dataport.data_value");
+      {
+	Guard guard(m_profile_mutex);
+	m_propValueIndex = NVUtil::find_index(m_profile.properties,
+					      "dataport.data_value");
+      }
     }
     
     /*!
@@ -211,7 +215,10 @@
           (*m_onWrite)(value);
           RTC_TRACE(("OnWrite called"));
         }
-      m_profile.properties[m_propValueIndex].value <<= value;
+      {
+	Guard guard(m_profile_mutex);
+	m_profile.properties[m_propValueIndex].value <<= value;
+      }
 
       bool result(true);
       std::vector<const char *> disconnect_ids;


Property changes on: branches/RELENG_1_1/OpenRTM-aist/src/lib/rtm/OutPort.h
___________________________________________________________________
Added: svn:mergeinfo
   + /tags/RELEASE_1_1_0/OpenRTM-aist/src/lib/rtm/OutPort.h:2364-2372
/tags/RELEASE_1_1_0_RC2/OpenRTM-aist/src/lib/rtm/OutPort.h:2173
/trunk/OpenRTM-aist:2753-2754
/trunk/OpenRTM-aist/src/lib/rtm/OutPort.h:2154-2172,2174-2176,2180,2183-2208,2213,2328,2346,2381-2383,2389-2393,2397-2398,2400-2401,2409,2411-2412,2512-2513,2515-2516,2522-2525,2530-2531,2534-2539,2542-2543,2545-2546,2548-2566,2568-2574,2592,2605,2610,2623,2626,2644,2648,2652-2653,2670,2677-2678,2681-2682,2684-2687,2689-2692,2696-2697,2700,2703,2706,2711-2712,2715-2721,2724,2728-2730,2733-2734,2738-2739,2743,2747-2748,2750-2753