Repository: deltaspike Updated Branches: refs/heads/master 3de3a3b67 -> b0a0983b1
on jdk 7 COMPLETION_STAGE is null - not fast enough idea flush, sorry Project: http://git-wip-us.apache.org/repos/asf/deltaspike/repo Commit: http://git-wip-us.apache.org/repos/asf/deltaspike/commit/b0a0983b Tree: http://git-wip-us.apache.org/repos/asf/deltaspike/tree/b0a0983b Diff: http://git-wip-us.apache.org/repos/asf/deltaspike/diff/b0a0983b Branch: refs/heads/master Commit: b0a0983b15eb0e6ffc401b8cff467bce7063026d Parents: 3de3a3b Author: Romain manni-Bucau <[email protected]> Authored: Thu Mar 17 12:42:34 2016 +0100 Committer: Romain manni-Bucau <[email protected]> Committed: Thu Mar 17 12:42:34 2016 +0100 ---------------------------------------------------------------------- .../apache/deltaspike/core/impl/future/FutureableInterceptor.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/deltaspike/blob/b0a0983b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/future/FutureableInterceptor.java ---------------------------------------------------------------------- diff --git a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/future/FutureableInterceptor.java b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/future/FutureableInterceptor.java index 4e04734..a9119ed 100644 --- a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/future/FutureableInterceptor.java +++ b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/future/FutureableInterceptor.java @@ -119,7 +119,7 @@ public class FutureableInterceptor implements Serializable try { final Object proceed = ic.proceed(); - final Future<?> future = !COMPLETION_STAGE.isInstance(proceed) ? + final Future<?> future = COMPLETION_STAGE == null || !COMPLETION_STAGE.isInstance(proceed) ? Future.class.cast(proceed) : Future.class.cast(COMPLETABLE_STAGE_TO_FUTURE.invoke(proceed)); /*
