From cb0c0e800f501e145a378ddf75888a18bfbaf3cd Mon Sep 17 00:00:00 2001
From: ribeaudc <ribeaudc>
Date: Thu, 5 Jun 2008 17:28:44 +0000
Subject: [PATCH] [DMV-20] fix: - 'ready-to-move' high water mark was
considered instead of the one of 'outgoing-store'. minor: - Improve help text
for highwater mark.
SVN: 6474
---
.../source/java/ch/systemsx/cisd/datamover/DataMover.java | 2 +-
.../source/java/ch/systemsx/cisd/datamover/Parameters.java | 3 ++-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/datamover/source/java/ch/systemsx/cisd/datamover/DataMover.java b/datamover/source/java/ch/systemsx/cisd/datamover/DataMover.java
index 7cf0f584104..2a3f42a9950 100644
--- a/datamover/source/java/ch/systemsx/cisd/datamover/DataMover.java
+++ b/datamover/source/java/ch/systemsx/cisd/datamover/DataMover.java
@@ -155,7 +155,7 @@ public class DataMover
createRemotePathMover(readyToMoveStore, outgoingStore);
final HighwaterMarkDirectoryScanningHandler directoryScanningHandler =
new HighwaterMarkDirectoryScanningHandler(new FaultyPathDirectoryScanningHandler(
- sourceDirectory), readyToMoveStore.getHighwaterMarkWatcher());
+ sourceDirectory), outgoingStore.getHighwaterMarkWatcher());
final DirectoryScanningTimerTask outgoingMovingTask =
new DirectoryScanningTimerTask(sourceDirectory, FileUtilities.ACCEPT_ALL_FILTER,
remoteStoreMover, directoryScanningHandler);
diff --git a/datamover/source/java/ch/systemsx/cisd/datamover/Parameters.java b/datamover/source/java/ch/systemsx/cisd/datamover/Parameters.java
index 73cd1f62e78..dba7085acf0 100644
--- a/datamover/source/java/ch/systemsx/cisd/datamover/Parameters.java
+++ b/datamover/source/java/ch/systemsx/cisd/datamover/Parameters.java
@@ -64,7 +64,8 @@ public final class Parameters implements ITimingParameters, IFileSysParameters
static final int DEFAULT_DATA_COMPLETED_SCRIPT_TIMEOUT = 600;
- private final static String HIGHWATER_MARK_TEXT = "(high water mark in KB after the ':')";
+ private final static String HIGHWATER_MARK_TEXT =
+ "(optional high water mark in KB specified after a ':')";
private static final Logger operationLog =
LogFactory.getLogger(LogCategory.OPERATION, Parameters.class);
--
GitLab