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

[openrtm ＠ openrtm.org]

Author: t-katami
Date: 2018-03-20 16:30:41 +0900 (Tue, 20 Mar 2018)
New Revision: 1118

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/ModuleManager.java
Log:
[compat,bugfix,->RELENG_1_2] Fixed to take a blank. Fixed rtcd starting parameters. refs #4483

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	2018-03-19 07:53:21 UTC (rev 1117)
+++ trunk/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/ManagerServant.java	2018-03-20 07:30:41 UTC (rev 1118)
@@ -1532,7 +1532,7 @@
             cmd.add("-o");
             cmd.add("manager.supported_languages:"+ comp_param.language());
             cmd.add("-o");
-            cmd.add("manager.shutdown_auto:YES");
+            cmd.add("manager.shutdown_auto:NO");
             cmd.add("-o");
             String log_level = config.getProperty("logger.log_level");
             cmd.add("logger.log_level:"+log_level);

Modified: trunk/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/ModuleManager.java
===================================================================
--- trunk/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/ModuleManager.java	2018-03-19 07:53:21 UTC (rev 1117)
+++ trunk/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/ModuleManager.java	2018-03-20 07:30:41 UTC (rev 1118)
@@ -741,10 +741,14 @@
             }
         
             // reformat file path and remove cached files
+            String separator =  System.getProperty("file.separator");
             for (String file : flist) {
                 if (!path.endsWith("/")) { 
                     path += "/"; 
                 }
+                //if (!path.endsWith(separator)) { 
+                //    path += separator; 
+                //}
                 String fpath = path + file;
                 addNewFile(fpath, modules);
             }
@@ -912,7 +916,7 @@
                         if(line == null){
                             break;
                         }
-                        String[] vstr = line.split(":");
+                        String[] vstr = line.split("[\\s]*:[\\s]*");
                         if(vstr.length != 1){
                             prop.setProperty(vstr[0],vstr[1]);
                         }