Introduce JCR agent. Client agent not needed anymore.

[gpl/argeo-slc.git] / runtime / org.argeo.slc.core / src / main / java / org / argeo / slc / core / execution / DefaultExecutionFlowDescriptorConverter.java

diff --git a/runtime/org.argeo.slc.core/src/main/java/org/argeo/slc/core/execution/DefaultExecutionFlowDescriptorConverter.java b/runtime/org.argeo.slc.core/src/main/java/org/argeo/slc/core/execution/DefaultExecutionFlowDescriptorConverter.java
index e4e24ec819122c1bcb4f81e1d9d4fd42590572e5..7860feea6b6e7bcf93607951e758918a6cab1ae3 100644 (file)
--- a/runtime/org.argeo.slc.core/src/main/java/org/argeo/slc/core/execution/DefaultExecutionFlowDescriptorConverter.java
+++ b/runtime/org.argeo.slc.core/src/main/java/org/argeo/slc/core/execution/DefaultExecutionFlowDescriptorConverter.java
@@ -300,15 +300,16 @@ public class DefaultExecutionFlowDescriptorConverter implements
 
                        // Check whether name include path
                        int lastIndex1 = name1.lastIndexOf('/');
+                       //log.debug(name1+", "+lastIndex1);
                        if (!StringUtils.hasText(path1) && lastIndex1 >= 0) {
-                               name1 = name1.substring(lastIndex1 + 1);
                                path1 = name1.substring(0, lastIndex1);
+                               name1 = name1.substring(lastIndex1 + 1);
                        }
 
                        int lastIndex2 = name2.lastIndexOf('/');
                        if (!StringUtils.hasText(path2) && lastIndex2 >= 0) {
-                               name2 = name2.substring(lastIndex2 + 1);
                                path2 = name2.substring(0, lastIndex2);
+                               name2 = name2.substring(lastIndex2 + 1);
                        }
 
                        // Perform the actual comparison