Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorslewis2018-04-09 18:48:44 -0400
committerslewis2018-04-09 18:48:44 -0400
commit1eaaf2ce97efa978226fe6524a31c4d1696d17f9 (patch)
treef85222bda7b154e0ce812ae1332582c030c0ba7e /framework/bundles
parent36a53be07e74f800d9e3a8baa93b99d03ff0f0bd (diff)
downloadorg.eclipse.ecf-1eaaf2ce97efa978226fe6524a31c4d1696d17f9.tar.gz
org.eclipse.ecf-1eaaf2ce97efa978226fe6524a31c4d1696d17f9.tar.xz
org.eclipse.ecf-1eaaf2ce97efa978226fe6524a31c4d1696d17f9.zip
Fix for missing condition in AsyncReturnUtil for Additional fixes for
bug https://bugs.eclipse.org/bugs/show_bug.cgi?id=532205 Change-Id: I0000000000000000000000000000000000000000
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