[openrtm-commit:03044] r1087 - in trunk/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC: . port

[openrtm ＠ openrtm.org]

Author: t-katami
Date: 2017-12-26 13:49:51 +0900 (Tue, 26 Dec 2017)
New Revision: 1087

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

Modified: trunk/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/Manager.java
===================================================================
--- trunk/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/Manager.java	2017-12-22 08:55:35 UTC (rev 1086)
+++ trunk/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/Manager.java	2017-12-26 04:49:51 UTC (rev 1087)
@@ -3949,6 +3949,7 @@
      *
      */
     protected boolean initManagerServant() {
+        rtcout.println(Logbuf.TRACE, "initManagerServant()");
         if (!StringUtil.toBool(m_config.getProperty("manager.corba_servant"), 
                                                     "YES", "NO", true)) {
             return true;
@@ -4837,7 +4838,7 @@
      * {@.en Setting endpoint info from corba.endpoints}
      */
     protected void setEndpointProperty(Object objref) {
-        rtcout.println(Logbuf.TRACE,"sedEndpointProperty()");
+        rtcout.println(Logbuf.TRACE,"setEndpointProperty()");
         if(objref==null){
             rtcout.println(Logbuf.WARN,"Object reference is nil.");
             return;

Modified: trunk/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/port/ConnectorDataListenerT.java
===================================================================
--- trunk/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/port/ConnectorDataListenerT.java	2017-12-22 08:55:35 UTC (rev 1086)
+++ trunk/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/port/ConnectorDataListenerT.java	2017-12-26 04:49:51 UTC (rev 1087)
@@ -97,23 +97,26 @@
      *   {@.en Object}
      */
     public void update(Observable o, Object obj) {
-        //ConnectorDataListenerArgument arg
-        //       = (ConnectorDataListenerArgument)obj;
+        rtcout.println(Logbuf.PARANOID, "update");
         ConnectorDataListenerArgumentDataRef<DataType> arg 
             = (ConnectorDataListenerArgumentDataRef<DataType>)obj;
         String type = arg.m_info.properties.getProperty("interface_type");
 
         String data_type = arg.m_info.properties.getProperty("data_type");
+        rtcout.println(Logbuf.PARANOID, "interface_type:"+type);
+        rtcout.println(Logbuf.PARANOID, "data_type:"+data_type);
+        rtcout.println(Logbuf.PARANOID, "m_id:"+m_id);
+        if(data_type.isEmpty()) {
+             data_type = m_id;
+        } 
         if(!m_id.equals(data_type)) {
             return;
         }
-        //rtcout.println(Logbuf.TRACE, "interface_type:"+type);
         if(type.equals("direct")) {
             m_datatype = (DataType)arg.m_data;
         }
         else { 
             try {
-                //m_streamable._read(arg.m_data.create_input_stream());
                 OutputStream out_data = (OutputStream)arg.m_data;
                 m_streamable._read(out_data.create_input_stream());
                 m_datatype = (DataType)m_field.get(m_streamable);