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

[openrtm ＠ openrtm.org]

Author: t-katami
Date: 2017-09-05 16:51:16 +0900 (Tue, 05 Sep 2017)
New Revision: 1036

Modified:
   trunk/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/NamingOnManager.java
Log:
[compat,bugfix,->releng_1_2] Fixed bugs of the rtcloc form. refs #3386

Modified: trunk/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/NamingOnManager.java
===================================================================
--- trunk/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/NamingOnManager.java	2017-09-05 07:08:18 UTC (rev 1035)
+++ trunk/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/NamingOnManager.java	2017-09-05 07:51:16 UTC (rev 1036)
@@ -369,9 +369,20 @@
         try{
             String mgrloc = "corbaloc:iiop:";
             Properties prop = m_mgr.getConfig();
+            
+            String[] names = name.split(":");
+            if (names.length == 1 && !names[0].equals("")) {
+                rtcout.println(Logbuf.PARANOID, "corba.master_managerc=" +
+                        prop.getProperty("corba.master_manager"));
+                String[] port = 
+                    prop.getProperty("corba.master_manager").split(":");
+                name = name + ":" + port[1];
+            }
+
             String manager_name = prop.getProperty("manager.name");
             mgrloc += name;
             mgrloc += "/" + manager_name;
+            rtcout.println(Logbuf.PARANOID, "mgrloc= "+mgrloc);
       
             Object mobj = m_orb.string_to_object(mgrloc);
             rtcout.println(Logbuf.DEBUG, "mobj= "+mobj);