fix: - ETL server Unit tests.

SVN: 6416

common/source/java/ch/systemsx/cisd/common/exceptions/StopException.java

@@ -21,6 +21,7 @@ package ch.systemsx.cisd.common.exceptions;
  * <p>
  * This is usually triggered by interrupting the thread that the work package is processed in and
  * regularly checking with {@link #check()}.
+ * </p>
  * 
  * @author Bernd Rinn
  */

common/source/java/ch/systemsx/cisd/common/process/FileRenamingCallable.java

@@ -59,19 +59,22 @@ public final class FileRenamingCallable implements Callable<Boolean>
             operationLog.error(String.format(
                     "Path '%s' doesn't exist, so it can't be moved to '%s'.", sourceFile,
                     destinationFile));
-            // Nothing to do here. So exit the looping by returning true.
-            return true;
+            return false;
         }
         if (destinationFile.exists())
         {
             operationLog.error(String.format("Destination path '%s' already exists.",
                     destinationFile));
-            // Nothing to do here. So exit the looping by returning true.
-            return true;
+            return false;
         }
-        operationLog.warn(String.format("Moving path '%s' to directory '%s' failed (attempt %d).",
-                sourceFile, destinationFile, ++failures));
         final boolean renamed = sourceFile.renameTo(destinationFile);
-        return renamed ? true : null;
+        if (renamed == false)
+        {
+            operationLog.warn(String.format(
+                    "Moving path '%s' to directory '%s' failed (attempt %d).", sourceFile,
+                    destinationFile, ++failures));
+            return null;
+        }
+        return true;
     }
 }
\ No newline at end of file