[openrtm-commit:03253] r1119 - 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-20 17:45:35 +0900 (Tue, 20 Mar 2018)
New Revision: 1119

Modified:
   branches/RELENG_1_2/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/CompParam.java
   branches/RELENG_1_2/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/DefaultConfiguration.java
   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/ModuleManager.java
Log:
[merge] r1115-r1118 have been merged from trunk.

Modified: branches/RELENG_1_2/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/CompParam.java
===================================================================
--- branches/RELENG_1_2/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/CompParam.java	2018-03-20 07:30:41 UTC (rev 1118)
+++ branches/RELENG_1_2/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/CompParam.java	2018-03-20 08:45:35 UTC (rev 1119)
@@ -36,7 +36,7 @@
      */
     public CompParam(String module_name){
         String modulename = module_name.split("\\?")[0];
-        String[] param_list = modulename.split(":",-1);
+        String[] param_list = modulename.split("[\\s]*:[\\s]*",-1);
         if(param_list.length < prof_list.size()){
             m_type = "RTC";
             m_vendor = "";

Modified: branches/RELENG_1_2/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/DefaultConfiguration.java
===================================================================
--- branches/RELENG_1_2/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/DefaultConfiguration.java	2018-03-20 07:30:41 UTC (rev 1118)
+++ branches/RELENG_1_2/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/DefaultConfiguration.java	2018-03-20 08:45:35 UTC (rev 1119)
@@ -73,9 +73,9 @@
         "sdo.service.provider.enabled_services",  "ALL",
         "sdo.service.consumer.enabled_services",  "ALL",
         "manager.local_service.enabled_services","ALL",
-        "manager.modules.C++.load_paths",     "./",
-        "manager.modules.Python.load_paths",  "./",
-        "manager.modules.Java.load_paths",    "./",
+        "manager.modules.C++.load_paths",     "",
+        "manager.modules.Python.load_paths",  "",
+        "manager.modules.Java.load_paths",    "",
         "manager.modules.search_auto",        "YES",
         "manager.supported_languages",        "C++, Python, Java",
         "manager.modules.C++.suffixes",       "",

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	2018-03-20 07:30:41 UTC (rev 1118)
+++ branches/RELENG_1_2/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/ManagerServant.java	2018-03-20 08:45:35 UTC (rev 1119)
@@ -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: branches/RELENG_1_2/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/ModuleManager.java
===================================================================
--- branches/RELENG_1_2/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)
+++ branches/RELENG_1_2/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/ModuleManager.java	2018-03-20 08:45:35 UTC (rev 1119)
@@ -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]);
                         }