X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;ds=sidebyside;f=runtime%2Forg.argeo.slc.core%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fslc%2Fcore%2Fexecution%2FDefaultExecutionFlowDescriptorConverter.java;h=7860feea6b6e7bcf93607951e758918a6cab1ae3;hb=548235484edd6b48de5ddc3bbca318e0e49cb57b;hp=e4e24ec819122c1bcb4f81e1d9d4fd42590572e5;hpb=0bcca59c19e554f94ec03af0dc7c44047a2eade7;p=gpl%2Fargeo-slc.git

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 e4e24ec81..7860feea6 100644
--- 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