diff --git a/src/main/java/teetime/framework/ConfigurationContext.java b/src/main/java/teetime/framework/ConfigurationContext.java index a0b66853376e58a6b69b71d8b133f362d44bb87b..2e4e3ece8193df2835e6e6d0f341090a932e0fac 100644 --- a/src/main/java/teetime/framework/ConfigurationContext.java +++ b/src/main/java/teetime/framework/ConfigurationContext.java @@ -104,6 +104,18 @@ final class ConfigurationContext { child.threadService = this.threadService; } + void executeConfiguration() { + this.threadService.onExecute(); + } + + void abortConfigurationRun() { + this.threadService.onTerminate(); + } + + void waitForConfigurationToTerminate() { + this.threadService.onFinish(); + } + public ThreadService getRuntimeService() { return threadService; } diff --git a/src/main/java/teetime/framework/Execution.java b/src/main/java/teetime/framework/Execution.java index f309d4966ffd5f52c77757ff5438643ee5692370..007ec6facfaab8e377598e28cf01628d399160cc 100644 --- a/src/main/java/teetime/framework/Execution.java +++ b/src/main/java/teetime/framework/Execution.java @@ -113,12 +113,13 @@ public final class Execution<T extends Configuration> { * @since 2.0 */ public void waitForTermination() { - getConfiguration().getContext().getRuntimeService().onFinish(); + getConfiguration().getContext().waitForConfigurationToTerminate(); + ; } // TODO: implement private void abortEventually() { - getConfiguration().getContext().getRuntimeService().onTerminate(); + getConfiguration().getContext().abortConfigurationRun(); waitForTermination(); } @@ -142,7 +143,7 @@ public final class Execution<T extends Configuration> { * @since 2.0 */ public void executeNonBlocking() { - configuration.getContext().getRuntimeService().onExecute(); + configuration.getContext().executeConfiguration(); } /** diff --git a/src/main/java/teetime/framework/ThreadService.java b/src/main/java/teetime/framework/ThreadService.java index ab879294992c1408821e2fa3b9c6af4921047013..985cdf0a1032e1f46337964b71f46c6bd9eadc5b 100644 --- a/src/main/java/teetime/framework/ThreadService.java +++ b/src/main/java/teetime/framework/ThreadService.java @@ -122,9 +122,9 @@ class ThreadService extends AbstractService<ThreadService> { thread.interrupt(); } - if (!exceptions.isEmpty()) { - throw new ExecutionException(exceptions); - } + // if (!exceptions.isEmpty()) { + // throw new ExecutionException(exceptions); + // } } private void initializeIntraStages(final Set<Stage> intraStages, final Thread thread, final AbstractExceptionListener newListener) {