[openrtm-commit:03319] r1123 - branches/RELENG_1_2/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC

[openrtm ＠ openrtm.org]

Author: t-katami
Date: 2018-03-28 17:40:45 +0900 (Wed, 28 Mar 2018)
New Revision: 1123

Modified:
   branches/RELENG_1_2/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/ManagerConfig.java
Log:
[merge] r1115 have been merged from trunk. r1115 was not being merged. It was merged once again.

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	2018-03-28 06:57:52 UTC (rev 1122)
+++ branches/RELENG_1_2/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/ManagerConfig.java	2018-03-28 08:40:45 UTC (rev 1123)
@@ -398,7 +398,6 @@
     protected boolean findConfigFile() {
         
         // Check existance of configuration file given command arg
-        System.out.println("zxci:"+m_configFile);
         if (! (m_configFile == null || m_configFile.length() == 0)) {
             if (fileExist(m_configFile)) {
                 return true;
@@ -410,7 +409,6 @@
 
         // Search rtc configuration file from environment variable
         String env = System.getenv(CONFIG_FILE_ENV);
-        System.out.println("env:"+env);
         if (env != null) {
             if (fileExist(env)) {
                 this.m_configFile = env;