Fix issue with skip

git-svn-id: https://svn.argeo.org/slc/trunk@1769 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc

diff --git a/org.argeo.slc.detached/src/main/java/org/argeo/slc/detached/DetachedExecutionServerImpl.java b/org.argeo.slc.detached/src/main/java/org/argeo/slc/detached/DetachedExecutionServerImpl.java
index 1a601310b309fdf99e22e979158671245f6874e3..ca16fb344f083dbb5fe2f8ba3388ea475e96ee56 100644 (file)
--- a/org.argeo.slc.detached/src/main/java/org/argeo/slc/detached/DetachedExecutionServerImpl.java
+++ b/org.argeo.slc.detached/src/main/java/org/argeo/slc/detached/DetachedExecutionServerImpl.java
@@ -103,6 +103,17 @@ public class DetachedExecutionServerImpl implements DetachedExecutionServer {
 
                                        if (previousAnswer.getStatus() != DetachedAnswer.ERROR) {
                                                execute = false;
+                                               String msg = "Skipped path " + request.getPath()
+                                                               + " (skipCount=" + skipCount + ")";
+                                               skippedLog.append(msg);
+                                               log.info(msg);
+                                               skipCount++;
+                                       } else {
+                                               log
+                                                               .info("Path "
+                                                                               + request.getPath()
+                                                                               + " was previously in error, executing it again."
+                                                                               + " (skipCount=" + skipCount + ")");
                                        }
                                } else {
                                        // went further as skip count, doing nothing.
@@ -114,8 +125,6 @@ public class DetachedExecutionServerImpl implements DetachedExecutionServer {
                        DetachedStep step = (DetachedStep) obj;
                        answer = step.execute(detachedContext, request);
                } else {
-                       skippedLog.append("Skipped path " + request.getPath()
-                                       + " (skipCount=" + skipCount + ")");
                        answer = new DetachedAnswer(request);
                        answer.setStatus(DetachedAnswer.SKIPPED);
                        answer.setLog(skippedLog.toString());