From b0c99396650a239f15f9b8849f674eab22793ffa Mon Sep 17 00:00:00 2001
From: ribeaudc <ribeaudc>
Date: Tue, 3 Jun 2008 04:16:28 +0000
Subject: [PATCH] change: - 'ProcessRunner' and 'IProcess' refactored. Now
called 'CallableExecutor'.
SVN: 6412
---
.../datamover/filesystem/RetryingPathMover.java | 13 ++++++-------
1 file changed, 6 insertions(+), 7 deletions(-)
diff --git a/datamover/source/java/ch/systemsx/cisd/datamover/filesystem/RetryingPathMover.java b/datamover/source/java/ch/systemsx/cisd/datamover/filesystem/RetryingPathMover.java
index 2822107924f..c509a493e96 100644
--- a/datamover/source/java/ch/systemsx/cisd/datamover/filesystem/RetryingPathMover.java
+++ b/datamover/source/java/ch/systemsx/cisd/datamover/filesystem/RetryingPathMover.java
@@ -24,8 +24,8 @@ import org.apache.log4j.Logger;
import ch.systemsx.cisd.common.logging.LogCategory;
import ch.systemsx.cisd.common.logging.LogFactory;
-import ch.systemsx.cisd.common.process.FileRenamingProcess;
-import ch.systemsx.cisd.common.process.ProcessRunner;
+import ch.systemsx.cisd.common.process.CallableExecutor;
+import ch.systemsx.cisd.common.process.FileRenamingCallable;
import ch.systemsx.cisd.common.utilities.FileUtilities;
import ch.systemsx.cisd.datamover.filesystem.intf.IPathMover;
@@ -73,11 +73,10 @@ class RetryingPathMover implements IPathMover
destinationPath));
}
File destFile = new File(destinationPath);
- final FileRenamingProcess process =
- new FileRenamingProcess(maxRetriesOnFailure, millisToSleepOnFailure, sourcePath,
- destFile);
- new ProcessRunner(process);
- if (process.isRenamed() == false)
+ final Boolean renamed =
+ new CallableExecutor(maxRetriesOnFailure, millisToSleepOnFailure)
+ .executeCallable(new FileRenamingCallable(sourcePath, destFile));
+ if (renamed == null || renamed == false)
{
notificationLog.error(String.format(
"Moving path '%s' to directory '%s' failed, giving up.", sourcePath,
--
GitLab