Repository: deltaspike Updated Branches: refs/heads/master 68939f30a -> 9c8c62d2c
DELTASPIKE-1128 moved timeout-config to CoreBaseConfig Project: http://git-wip-us.apache.org/repos/asf/deltaspike/repo Commit: http://git-wip-us.apache.org/repos/asf/deltaspike/commit/9c8c62d2 Tree: http://git-wip-us.apache.org/repos/asf/deltaspike/tree/9c8c62d2 Diff: http://git-wip-us.apache.org/repos/asf/deltaspike/diff/9c8c62d2 Branch: refs/heads/master Commit: 9c8c62d2c14735737927c64f12fe3062c431422f Parents: 68939f3 Author: gpetracek <[email protected]> Authored: Sat Apr 16 12:34:39 2016 +0200 Committer: gpetracek <[email protected]> Committed: Sat Apr 16 13:11:04 2016 +0200 ---------------------------------------------------------------------- .../deltaspike/core/api/config/base/CoreBaseConfig.java | 12 ++++++++++++ .../deltaspike/core/impl/future/ThreadPoolManager.java | 5 ++--- 2 files changed, 14 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/deltaspike/blob/9c8c62d2/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/config/base/CoreBaseConfig.java ---------------------------------------------------------------------- diff --git a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/config/base/CoreBaseConfig.java b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/config/base/CoreBaseConfig.java index 5156164..4831315 100644 --- a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/config/base/CoreBaseConfig.java +++ b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/config/base/CoreBaseConfig.java @@ -20,6 +20,8 @@ package org.apache.deltaspike.core.api.config.base; import org.apache.deltaspike.core.api.config.ConfigResolver; +import java.util.concurrent.TimeUnit; + public interface CoreBaseConfig extends DeltaSpikeBaseConfig { interface BeanManagerIntegration @@ -88,4 +90,14 @@ public interface CoreBaseConfig extends DeltaSpikeBaseConfig .getValue(); } } + + interface TimeoutCustomization + { + Integer FUTUREABLE_TERMINATION_TIMEOUT_IN_MILLISECONDS = + ConfigResolver.resolve("deltaspike.futureable.termination-timeout_in_milliseconds") + .as(Integer.class) + .withCurrentProjectStage(true) + .withDefault((int) TimeUnit.MINUTES.toMillis(1)) + .getValue(); + } } http://git-wip-us.apache.org/repos/asf/deltaspike/blob/9c8c62d2/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/future/ThreadPoolManager.java ---------------------------------------------------------------------- diff --git a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/future/ThreadPoolManager.java b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/future/ThreadPoolManager.java index e1711a0..9dc6667 100644 --- a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/future/ThreadPoolManager.java +++ b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/future/ThreadPoolManager.java @@ -18,7 +18,7 @@ */ package org.apache.deltaspike.core.impl.future; -import org.apache.deltaspike.core.api.config.ConfigResolver; +import org.apache.deltaspike.core.api.config.base.CoreBaseConfig; import javax.annotation.PreDestroy; import javax.enterprise.context.ApplicationScoped; @@ -39,8 +39,7 @@ public class ThreadPoolManager private void shutdown() { closed = true; - final String propertyValue = ConfigResolver.getPropertyValue("deltaspike.future.timeout"); - final long timeout = propertyValue == null ? TimeUnit.MINUTES.toMillis(1) : Integer.parseInt(propertyValue); + final long timeout = CoreBaseConfig.TimeoutCustomization.FUTUREABLE_TERMINATION_TIMEOUT_IN_MILLISECONDS; for (final ExecutorService es : pools.values()) { es.shutdown();
