[openrtm-commit:02892] r1071 - in branches/RELENG_1_2/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src: RTMExamples_scripts jp/go/aist/rtm/RTC

[openrtm ＠ openrtm.org]

Author: kawauchi
Date: 2017-10-27 14:47:36 +0900 (Fri, 27 Oct 2017)
New Revision: 1071

Modified:
   branches/RELENG_1_2/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/RTMExamples_scripts/rtcd_java.conf
   branches/RELENG_1_2/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/CorbaNaming.java
   branches/RELENG_1_2/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/ManagerConfig.java
   branches/RELENG_1_2/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/ManagerServant.java
Log:
[merge] r1066-1070 have been merged from trunk.

Modified: branches/RELENG_1_2/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/RTMExamples_scripts/rtcd_java.conf
===================================================================
--- branches/RELENG_1_2/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/RTMExamples_scripts/rtcd_java.conf	2017-10-27 04:52:30 UTC (rev 1070)
+++ branches/RELENG_1_2/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/RTMExamples_scripts/rtcd_java.conf	2017-10-27 05:47:36 UTC (rev 1071)
@@ -2,7 +2,7 @@
 naming.formats: %h.host_cxt/%n.rtc
 logger.enable: NO
 logger.log_level: PARANOID
-manager.modules.load_path:C:\\Program Files\\OpenRTM-aist\\1.0\\examples\\Java\\RTMExamples\\SimpleIO\\
+#manager.modules.load_path: C:\\Program Files\\OpenRTM-aist\\1.2.0\\Components\\Java\\RTMExamples\\SimpleIO
 #manager.modules.load_path: /home/openrtm/work/java/RELENG_1_0_0/jp.go.aist.rtm.RTC/installer/resources/Source/examples/RTMExamples/SimpleIO
 #manager.modules.load_path: ../examples/C++/, ../components/
 #manager.modules.preload: ConfigSample.dll, \

Modified: branches/RELENG_1_2/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/CorbaNaming.java
===================================================================
--- branches/RELENG_1_2/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/CorbaNaming.java	2017-10-27 04:52:30 UTC (rev 1070)
+++ branches/RELENG_1_2/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/CorbaNaming.java	2017-10-27 05:47:36 UTC (rev 1071)
@@ -733,9 +733,11 @@
         
         for( int intIdx=0;intIdx<len;intIdx++ ) {
             if( intIdx==(len-1) ) {
-                if( isNamingContext(obj) ) {
-                    cxt.rebind_context(subName(name, intIdx, intIdx), NamingContextExtHelper.narrow(obj));
-                } else {
+                if(obj instanceof org.omg.CosNaming.NamingContext){
+                    cxt.rebind_context(subName(name, intIdx, intIdx), 
+                                       NamingContextExtHelper.narrow(obj));
+                }
+                else{
                     cxt.rebind(subName(name, intIdx, intIdx), obj);
                 }
                 return;

Modified: branches/RELENG_1_2/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/ManagerConfig.java
===================================================================
--- branches/RELENG_1_2/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/ManagerConfig.java	2017-10-27 04:52:30 UTC (rev 1070)
+++ branches/RELENG_1_2/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/ManagerConfig.java	2017-10-27 05:47:36 UTC (rev 1071)
@@ -497,7 +497,7 @@
      * {@.ja 使用されるコンフィグレーションファイルのパス}
      * {@.en Manager's configuration file path}
      */
-    protected String m_configFile;
+    protected String m_configFile = new String();
     /**
      * {@.ja Manager マスタフラグ}
      * {@.en Manager master flag}

Modified: branches/RELENG_1_2/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/ManagerServant.java
===================================================================
--- branches/RELENG_1_2/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/ManagerServant.java	2017-10-27 04:52:30 UTC (rev 1070)
+++ branches/RELENG_1_2/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/ManagerServant.java	2017-10-27 05:47:36 UTC (rev 1071)
@@ -54,6 +54,8 @@
     public ManagerServant() {
         rtcout = new Logbuf("ManagerServant");
         m_mgr = jp.go.aist.rtm.RTC.Manager.instance();
+        m_objref = null; 
+        m_isMaster = false;
 
         Properties config = m_mgr.getConfig();    
     
@@ -1531,6 +1533,9 @@
             cmd.add("manager.supported_languages:"+ comp_param.language());
             cmd.add("-o");
             cmd.add("manager.shutdown_auto:YES");
+            cmd.add("-o");
+            String log_level = config.getProperty("logger.log_level");
+            cmd.add("logger.log_level:"+log_level);
 
             rtcout.println(Logbuf.DEBUG, "Invoking command: "+ cmd + ".");
             try{
@@ -1635,8 +1640,11 @@
             return rtobj;
         }
         catch (org.omg.CORBA.SystemException e) {
+            String crlf = System.getProperty("line.separator");
             rtcout.println(Logbuf.DEBUG, 
-                        "Exception was caught while creating component.");
+                        "Exception was caught while creating component."
+                        +crlf
+                        +e.toString());
             return null;
         }
     }
@@ -1720,6 +1728,9 @@
             cmd.add(mgrvstr[1]);
             cmd.add("-o");
             cmd.add("manager.modules.load_path:"+load_path);
+            cmd.add("-o");
+            String log_level = config.getProperty("logger.log_level");
+            cmd.add("logger.log_level:"+log_level);
 
             rtcout.println(Logbuf.DEBUG, "Invoking command: "+ cmd + ".");