From b3c9e0842f39d2b7b7752bdf58aa0a56ee1f10e9 Mon Sep 17 00:00:00 2001
From: ribeaudc <ribeaudc>
Date: Wed, 2 Jul 2008 14:21:38 +0000
Subject: [PATCH] fix: - Because we exit the application, remove the shutdown
triggering file.
SVN: 7001
---
.../source/java/ch/systemsx/cisd/datamover/DataMover.java | 3 ++-
.../java/ch/systemsx/cisd/datamover/DataMoverShutdownHook.java | 3 ++-
2 files changed, 4 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 e21abda92ff..165bebd65a3 100644
--- a/datamover/source/java/ch/systemsx/cisd/datamover/DataMover.java
+++ b/datamover/source/java/ch/systemsx/cisd/datamover/DataMover.java
@@ -89,7 +89,8 @@ public final class DataMover
private static final String[] PROCESS_MARKER_FILENAMES =
{ INCOMING_PROCESS_MARKER_FILENAME, OUTGOING_PROCESS_MARKER_FILENAME,
- LOCAL_PROCESS_MARKER_FILENAME, RECOVERY_PROCESS_MARKER_FILENAME };
+ LOCAL_PROCESS_MARKER_FILENAME, RECOVERY_PROCESS_MARKER_FILENAME,
+ SHUTDOWN_PROCESS_MARKER_FILENAME };
private static final Logger operationLog =
LogFactory.getLogger(LogCategory.OPERATION, DataMover.class);
diff --git a/datamover/source/java/ch/systemsx/cisd/datamover/DataMoverShutdownHook.java b/datamover/source/java/ch/systemsx/cisd/datamover/DataMoverShutdownHook.java
index 9678232d714..83e7749e17c 100644
--- a/datamover/source/java/ch/systemsx/cisd/datamover/DataMoverShutdownHook.java
+++ b/datamover/source/java/ch/systemsx/cisd/datamover/DataMoverShutdownHook.java
@@ -102,7 +102,8 @@ final class DataMoverShutdownHook implements ITriggerable
terminable.terminate();
deleteFile(outgoingTargetLocationFile, "outgoing target location");
deleteFile(markerFile, "marker");
- deleteFile(new File(DATAMOVER_PID_FILE_NAME), "Datamover pid file");
+ deleteFile(new File(DATAMOVER_PID_FILE_NAME), "Datamover pid");
+ deleteFile(new File(DataMover.SHUTDOWN_MARKER_FILENAME), "shutdown triggering");
exitHandler.exit(0);
}
}
\ No newline at end of file
--
GitLab