[openrtm-commit:03302] r3268 - trunk/OpenRTM-aist/src/lib/rtm

[openrtm ＠ openrtm.org]

Author: miyamoto
Date: 2018-03-28 12:43:20 +0900 (Wed, 28 Mar 2018)
New Revision: 3268

Modified:
   trunk/OpenRTM-aist/src/lib/rtm/DefaultConfiguration.h
   trunk/OpenRTM-aist/src/lib/rtm/OutPort.h
Log:
[merge] r3173-3174 have been merged from RELENG_1_2.

Modified: trunk/OpenRTM-aist/src/lib/rtm/DefaultConfiguration.h
===================================================================
--- trunk/OpenRTM-aist/src/lib/rtm/DefaultConfiguration.h	2018-03-28 03:37:10 UTC (rev 3267)
+++ trunk/OpenRTM-aist/src/lib/rtm/DefaultConfiguration.h	2018-03-28 03:43:20 UTC (rev 3268)
@@ -112,8 +112,8 @@
     "manager.modules.Java.load_paths",       "./",
     "manager.modules.search_auto",       "YES",
     "manager.local_service.enabled_services","ALL",
-    "sdo.service.provider.enabled_service",  "ALL",
-    "sdo.service.consumer.enabled_service",  "ALL",
+    "sdo.service.provider.enabled_services",  "ALL",
+    "sdo.service.consumer.enabled_services",  "ALL",
     ""
   };
 

Modified: trunk/OpenRTM-aist/src/lib/rtm/OutPort.h
===================================================================
--- trunk/OpenRTM-aist/src/lib/rtm/OutPort.h	2018-03-28 03:37:10 UTC (rev 3267)
+++ trunk/OpenRTM-aist/src/lib/rtm/OutPort.h	2018-03-28 03:43:20 UTC (rev 3268)
@@ -138,12 +138,7 @@
 #endif
         m_value(value), m_onWrite(0), m_onWriteConvert(0)
     {
-      addProperty("dataport.data_value", CORBA::Short(0));
-      {
-        Guard guard(m_profile_mutex);
-        m_propValueIndex = NVUtil::find_index(m_profile.properties,
-                                              "dataport.data_value");
-      }
+
       this->addConnectorDataListener(ON_BUFFER_WRITE,
                                      new Timestamp<DataType>("on_write"));
       this->addConnectorDataListener(ON_SEND,
@@ -220,11 +215,8 @@
           (*m_onWrite)(value);
           RTC_TRACE(("OnWrite called"));
         }
-      {
-        Guard guard(m_profile_mutex);
-        //m_profile.properties[m_propValueIndex].value <<= value;
-      }
 
+
       bool result(true);
       std::vector<const char *> disconnect_ids;
       {