Allow JSR223 scripts with same name in different directories (#3855)

Fixes #3801 Signed-off-by: Stefan Triller <stefan.triller@telekom.de>
eclipse-archived · Jul 24, 2017 · af2344e · af2344e
1 parent 29dcb2d
commit af2344e
Showing 1 changed file with 1 addition and 4 deletions.
diff --git a/...pse/smarthome/automation/module/script/rulesupport/internal/loader/ScriptFileWatcher.java b/...pse/smarthome/automation/module/script/rulesupport/internal/loader/ScriptFileWatcher.java
@@ -233,11 +233,8 @@ private void checkFiles() {
             @Override
             public int compare(URL o1, URL o2) {
                 String f1 = o1.getPath();
-                String s1 = f1.substring(f1.lastIndexOf("/") + 1);
                 String f2 = o2.getPath();
-                String s2 = f2.substring(f2.lastIndexOf("/") + 1);
-
-                return String.CASE_INSENSITIVE_ORDER.compare(s1, s2);
+                return String.CASE_INSENSITIVE_ORDER.compare(f1, f2);
             }
         });