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

[openrtm ＠ openrtm.org]

Author: kawauchi
Date: 2018-03-30 17:22:02 +0900 (Fri, 30 Mar 2018)
New Revision: 1130

Modified:
   branches/RELENG_1_2/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/ModuleManager.java
Log:
[merge] r1129 has been merged from trunk.

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-30 08:13:42 UTC (rev 1129)
+++ branches/RELENG_1_2/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/ModuleManager.java	2018-03-30 08:22:02 UTC (rev 1130)
@@ -1203,10 +1203,17 @@
             while(!stack.isEmpty()){
                 File item = stack.pop();
                 if (item.isDirectory()) {
-                    result.add(item.getPath());
-                    for (File child : item.listFiles()){
-                        stack.push(child);
+                    String str = item.getPath();
+                    String osname = System.getProperty("os.name").toLowerCase();
+                    if(osname.startsWith("windows")){
+                        str = str.replace("\\","/");
                     }
+                    if(result.indexOf(str)==-1){
+                        result.add(str);
+                        for (File child : item.listFiles()){
+                            stack.push(child);
+                        }
+                    }
                 }
             }
         }