[openrtm-commit:02775] r1028 - trunk/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/port

[openrtm ＠ openrtm.org]

Author: t-katami
Date: 2017-08-29 17:15:14 +0900 (Tue, 29 Aug 2017)
New Revision: 1028

Modified:
   trunk/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/port/InPortBase.java
   trunk/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/port/OutPortBase.java
Log:
[compat,bugfix,->RELENG_1_2] Fixed the bug. refs #4143

Modified: trunk/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/port/InPortBase.java
===================================================================
--- trunk/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/port/InPortBase.java	2017-08-28 06:52:22 UTC (rev 1027)
+++ trunk/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/port/InPortBase.java	2017-08-29 08:15:14 UTC (rev 1028)
@@ -25,6 +25,7 @@
 import org.omg.PortableServer.POA;
 
 import _SDOPackage.NVListHolder;
+import _SDOPackage.NameValue;
 import RTC.ConnectorProfile;
 import RTC.ConnectorProfileHolder;
 import RTC.ReturnCode_t;
@@ -308,12 +309,12 @@
         rtcout.println(Logbuf.TRACE, "init()");
         rtcout.println(Logbuf.PARANOID, "given properties:");
         String str = new String();
-        prop._dump(str,prop,0);
+        str = prop._dump(str,prop,0);
         rtcout.println(Logbuf.DEBUG, str);
 
         rtcout.println(Logbuf.PARANOID, "m_properties:");
         str = "";
-        m_properties._dump(str,m_properties,0);
+        str = m_properties._dump(str,m_properties,0);
         rtcout.println(Logbuf.DEBUG, str);
 
         m_properties.merge(prop);
@@ -326,7 +327,7 @@
 
         rtcout.println(Logbuf.PARANOID, "updated properties:");
         str = "";
-        m_properties._dump(str,m_properties,0);
+        str = m_properties._dump(str,m_properties,0);
         rtcout.println(Logbuf.DEBUG, str);
 
         if (m_singlebuffer) {
@@ -643,6 +644,12 @@
              *       << cprof[dataport.inport.buffer.write.full_policy]
              */
             prop.merge(conn_prop.getNode("dataport.inport"));
+
+            conn_prop.getNode("dataport").merge(prop);
+            NVListHolder holder = new NVListHolder(new NameValue[0]);
+            NVUtil.copyFromProperties(holder, conn_prop);
+            cprof.value.properties = holder.value;
+
         }
         rtcout.println(Logbuf.DEBUG, 
                            "ConnectorProfile::properties are as follows.");

Modified: trunk/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/port/OutPortBase.java
===================================================================
--- trunk/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/port/OutPortBase.java	2017-08-28 06:52:22 UTC (rev 1027)
+++ trunk/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/port/OutPortBase.java	2017-08-29 08:15:14 UTC (rev 1028)
@@ -27,6 +27,7 @@
 import org.omg.PortableServer.POA;
 
 import _SDOPackage.NVListHolder;
+import _SDOPackage.NameValue;
 import RTC.ConnectorProfile;
 import RTC.ConnectorProfileHolder;
 import RTC.ReturnCode_t;
@@ -98,12 +99,12 @@
 
         rtcout.println(Logbuf.PARANOID, "given properties:");
         String str = new String();
-        prop._dump(str,prop,0);
+        str = prop._dump(str,prop,0);
         rtcout.println(Logbuf.DEBUG, str);
 
         rtcout.println(Logbuf.PARANOID, "m_properties:");
         str = "";
-        m_properties._dump(str,m_properties,0);
+        str = m_properties._dump(str,m_properties,0);
         rtcout.println(Logbuf.DEBUG, str);
 
         m_properties.merge(prop);
@@ -117,7 +118,7 @@
 
         rtcout.println(Logbuf.PARANOID, "updated properties:");
         str = "";
-        m_properties._dump(str,m_properties,0);
+        str = m_properties._dump(str,m_properties,0);
         rtcout.println(Logbuf.DEBUG, str);
 
         configure();
@@ -655,6 +656,10 @@
              *       << cprof[dataport.outport.buffer.write.full_policy]
              */
             prop.merge(conn_prop.getNode("dataport.outport"));
+            conn_prop.getNode("dataport").merge(prop);
+            NVListHolder holder = new NVListHolder(new NameValue[0]);
+            NVUtil.copyFromProperties(holder, conn_prop);
+            cprof.value.properties = holder.value;
         }
         rtcout.println(Logbuf.DEBUG, 
                            "ConnectorProfile::properties are as follows.");