Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to 'framework/bundles')
-rw-r--r--framework/bundles/org.eclipse.ecf.remoteservice.asyncproxy.j8/src/org/eclipse/ecf/remoteservice/asyncproxy/AsyncReturnUtil.java2
1 files changed, 2 insertions, 0 deletions
diff --git a/framework/bundles/org.eclipse.ecf.remoteservice.asyncproxy.j8/src/org/eclipse/ecf/remoteservice/asyncproxy/AsyncReturnUtil.java b/framework/bundles/org.eclipse.ecf.remoteservice.asyncproxy.j8/src/org/eclipse/ecf/remoteservice/asyncproxy/AsyncReturnUtil.java
index 458aa7fbc..ceeda8b73 100644
--- a/framework/bundles/org.eclipse.ecf.remoteservice.asyncproxy.j8/src/org/eclipse/ecf/remoteservice/asyncproxy/AsyncReturnUtil.java
+++ b/framework/bundles/org.eclipse.ecf.remoteservice.asyncproxy.j8/src/org/eclipse/ecf/remoteservice/asyncproxy/AsyncReturnUtil.java
@@ -67,6 +67,8 @@ public class AsyncReturnUtil {
return null;
else if (asyncReturnType.isAssignableFrom(Future.class))
return ((Future<?>) returnObject).get(timeout, TimeUnit.MILLISECONDS);
+ else if (asyncReturnType.isAssignableFrom(CompletableFuture.class))
+ return ((CompletableFuture<?>) returnObject).get(timeout, TimeUnit.MILLISECONDS);
else if (asyncReturnType.isAssignableFrom(CompletionStage.class))
return ((CompletionStage<?>) returnObject).toCompletableFuture().get(timeout, TimeUnit.MILLISECONDS);
else if (asyncReturnType.isAssignableFrom(IFuture.class))

Back to the top