From 4598ad3befa7b67cec6bc5d43c78ee64a0635f80 Mon Sep 17 00:00:00 2001
From: brinn <brinn>
Date: Tue, 17 Jun 2008 19:22:16 +0000
Subject: [PATCH] change: - perform a major refactoring on TerminableCallable
by putting the thread guard stuff to a class of its own (ThreadGuard) -
ensure the TerminableCallable doesn't get started if it is cancelled or
terminated before it starts running - remove the hasCleanedUp() and
waitForCleanedUp() methods - remove the waitForStarted() method
SVN: 6653
---
.../common/concurrent/ITerminableFuture.java | 26 -------------------
1 file changed, 26 deletions(-)
diff --git a/common/source/java/ch/systemsx/cisd/common/concurrent/ITerminableFuture.java b/common/source/java/ch/systemsx/cisd/common/concurrent/ITerminableFuture.java
index 9f3325653c8..df4514d583c 100644
--- a/common/source/java/ch/systemsx/cisd/common/concurrent/ITerminableFuture.java
+++ b/common/source/java/ch/systemsx/cisd/common/concurrent/ITerminableFuture.java
@@ -18,7 +18,6 @@ package ch.systemsx.cisd.common.concurrent;
import java.util.concurrent.Future;
-import ch.systemsx.cisd.common.concurrent.TerminableCallable.ICleaner;
import ch.systemsx.cisd.common.exceptions.StopException;
import ch.systemsx.cisd.common.utilities.ITerminable;
@@ -36,15 +35,6 @@ public interface ITerminableFuture<V> extends Future<V>, ITerminable
*/
public boolean isRunning();
- /**
- * Waits for the task of the future to start running. The method waits at most
- * <var>timeoutMillis</var> milli-seconds.
- *
- * @return <code>true</code>, if the task of the future has started running when the method
- * returns.
- */
- public boolean waitForStarted(long timeoutMillis) throws StopException;
-
/**
* Returns <code>true</code>, if the task of the future has already started running.
*/
@@ -64,22 +54,6 @@ public interface ITerminableFuture<V> extends Future<V>, ITerminable
*/
public boolean hasFinished();
- /**
- * Waits for the task of the future to finish cleaning up. The method waits at most
- * <var>timeoutMillis</var> milli-seconds.
- *
- * @return <code>true</code>, if the task of the future has finished cleaning up when the
- * method returns.
- */
- public boolean waitForCleanedUp(long timeoutMillis) throws StopException;
-
- /**
- * Returns <code>true</code>, if the task of the future has already called the
- * {@link ICleaner#cleanUp(ch.systemsx.cisd.common.concurrent.TerminableCallable.FinishCause)}
- * method, if any.
- */
- public boolean hasCleanedUp();
-
/**
* Terminates the task of the future if it has already started running. If it has not yet
* started running, this method cancels it using {@link Future#cancel(boolean)}. Blocks until
--
GitLab