[openrtm-commit:02021] r837 - trunk/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC

[openrtm ＠ openrtm.org]

Author: win-ei
Date: 2016-10-07 09:54:47 +0900 (Fri, 07 Oct 2016)
New Revision: 837

Modified:
   trunk/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/CorbaNaming.java
   trunk/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/Manager.java
Log:
Fixed bugs. refs #3391

Modified: trunk/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/CorbaNaming.java
===================================================================
--- trunk/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/CorbaNaming.java	2016-10-06 09:49:09 UTC (rev 836)
+++ trunk/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/CorbaNaming.java	2016-10-07 00:54:47 UTC (rev 837)
@@ -1788,7 +1788,6 @@
  
             //delete tmp_char;
         }
-        bl.value  = new Binding[list_len];
         return;
     }
 
@@ -1859,7 +1858,9 @@
         int nc_length = 0;
         name_comps = string_name.split("/");
         nc_length = name_comps.length;
-        if( !(nc_length>0) ) throw new InvalidName();
+        if( !(nc_length>0) ) {
+           throw new InvalidName();
+        }
       
         // Name components are allocated
         NameComponent[] name = new NameComponent[nc_length];

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	2016-10-06 09:49:09 UTC (rev 836)
+++ trunk/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/Manager.java	2016-10-07 00:54:47 UTC (rev 837)
@@ -489,6 +489,7 @@
      *  # void subscribePorts(RTObject_impl* comp)
      */
     public void subscribePorts(RTObject_impl comp){
+        rtcout.println(Logbuf.TRACE, "Manager.subscribePorts()");
         PortService[] ports = comp.get_ports();
     
         for(int ic=0; ic<ports.length; ++ic ){
@@ -518,7 +519,6 @@
                 name  = "dataports.port_cxt/";
                 name += prop.getProperty("publish_topic") + ".topic_cxt";
                 nsports = getPortsOnNameServers(name, "inport");
-        
                 connectDataPorts(ports[ic], nsports);
             }
             else if(prop.getProperty("port.port_type").equals("DataInPort")){
@@ -604,7 +604,8 @@
                 }
                 String tmp = bl.value[ic].binding_name[0].id + "." 
                                 + bl.value[ic].binding_name[0].kind;
-                String nspath = "/" + nsname + "/" + tmp;
+                //String nspath = "/" + nsname + "/" + tmp;
+                String nspath = nsname + "/" + tmp;
                 nspath.replace("\\","");
 
                 Object obj;
@@ -685,6 +686,7 @@
   # void connectDataPorts(PortService_ptr port,PortServiceList_var& target_ports)
      */
     public void connectDataPorts(PortService port,PortService[] target_ports){
+        rtcout.println(Logbuf.TRACE, "Manager.connectDataPorts()");
         for(int ic=0;ic<target_ports.length;++ic){
             if(port._is_equivalent(target_ports[ic])){
                 continue;