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

[openrtm ＠ openrtm.org]

Author: t-katami
Date: 2017-10-26 10:23:16 +0900 (Thu, 26 Oct 2017)
New Revision: 1066

Modified:
   trunk/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/ManagerConfig.java
   trunk/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/ManagerServant.java
Log:
[compat,bugfix->releng_1_2] Fixed the bug. refs #4350

Modified: trunk/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/ManagerConfig.java
===================================================================
--- trunk/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/ManagerConfig.java	2017-10-25 05:55:58 UTC (rev 1065)
+++ trunk/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/ManagerConfig.java	2017-10-26 01:23:16 UTC (rev 1066)
@@ -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: trunk/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/ManagerServant.java
===================================================================
--- trunk/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/ManagerServant.java	2017-10-25 05:55:58 UTC (rev 1065)
+++ trunk/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/ManagerServant.java	2017-10-26 01:23:16 UTC (rev 1066)
@@ -1531,6 +1531,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 +1638,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 +1726,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 + ".");