new version with boolean-return instead of explicit method, to kill the

thread

src/main/java/teetime/framework/Analysis.java

@@ -99,7 +99,6 @@ public class Analysis implements UncaughtExceptionHandler {
 				} else {
 					runnable = new RunnableConsumerStage(stage, newListener);
 				}
-				newListener.setRunnableStage(runnable);
 				final Thread thread = new Thread(runnable);
 				stage.setOwningThread(thread);
 				this.consumerThreads.add(thread);
@@ -107,7 +106,6 @@ public class Analysis implements UncaughtExceptionHandler {
 			}
 			case BY_SELF_DECISION: {
 				RunnableProducerStage runnable = new RunnableProducerStage(stage, newListener);
-				newListener.setRunnableStage(runnable);
 				final Thread thread = new Thread(runnable);
 				stage.setOwningThread(thread);
 				this.finiteProducerThreads.add(thread);
@@ -115,7 +113,6 @@ public class Analysis implements UncaughtExceptionHandler {
 			}
 			case BY_INTERRUPT: {
 				RunnableProducerStage runnable = new RunnableProducerStage(stage, newListener);
-				newListener.setRunnableStage(runnable);
 				final Thread thread = new Thread(runnable);
 				stage.setOwningThread(thread);
 				this.infiniteProducerThreads.add(thread);

src/main/java/teetime/framework/RunnableStage.java

@@ -6,7 +6,7 @@ import org.slf4j.LoggerFactory;
 import teetime.framework.exceptionHandling.StageException;
 import teetime.framework.exceptionHandling.StageExceptionListener;
 
-public abstract class RunnableStage implements Runnable {
+abstract class RunnableStage implements Runnable {
 
 	protected final Stage stage;
 	@SuppressWarnings("PMD.LoggerIsNotStaticFinal")
@@ -30,7 +30,9 @@ public abstract class RunnableStage implements Runnable {
 				try {
 					executeStage();
 				} catch (StageException e) {
-					this.listener.onStageException(e, e.getThrowingStage());
+					if (!this.listener.onStageException(e, e.getThrowingStage())) {
+						this.stage.terminate();
+					}
 				}
 			} while (!this.stage.shouldBeTerminated());
 
@@ -47,11 +49,6 @@ public abstract class RunnableStage implements Runnable {
 		this.logger.debug("Finished runnable stage. (" + this.stage.getId() + ")");
 	}
 
-	public final void abortExecution() {
-		this.stage.terminate();
-		// TODO: flag error and throw exception
-	}
-
 	protected abstract void beforeStageExecution();
 
 	protected abstract void executeStage();

src/main/java/teetime/framework/exceptionHandling/DefaultListener.java

@@ -10,7 +10,7 @@ public class DefaultListener extends StageExceptionListener {
 	}
 
 	@Override
-	public void onStageException(final Exception e, final Stage throwingStage) {
-		// TODO Auto-generated method stub
+	public boolean onStageException(final Exception e, final Stage throwingStage) {
+		return true;
 	}
 }

src/main/java/teetime/framework/exceptionHandling/StageExceptionListener.java

@@ -3,7 +3,6 @@ package teetime.framework.exceptionHandling;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import teetime.framework.RunnableStage;
 import teetime.framework.Stage;
 
 /**
@@ -12,8 +11,6 @@ import teetime.framework.Stage;
  */
 public abstract class StageExceptionListener {
 
-	private RunnableStage runnable;
-
 	/**
 	 * The default logger, which can be used by all subclasses
 	 */
@@ -31,16 +28,6 @@ public abstract class StageExceptionListener {
 	 * @param throwingStage
 	 *            the stage, which has thrown the exception.
 	 */
-	public abstract void onStageException(Exception e, Stage throwingStage);
-
-	/**
-	 * This method can be used to terminate the execution of the thread.
-	 */
-	protected final void terminateExecution() {
-		this.runnable.abortExecution();
-	}
+	public abstract boolean onStageException(Exception e, Stage throwingStage);
 
-	public final void setRunnableStage(final RunnableStage runnableStage) {
-		this.runnable = runnableStage;
-	}
 }