Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorslewis2018-09-26 11:26:45 -0400
committerslewis2018-09-26 11:26:45 -0400
commit6ac280d43c07a834560e61c73278cd415cacf512 (patch)
tree8366174d0d6944dbd7e2148f0043dec34d047cc3
parentbed0962927e575d959258564814fb40d7baf8001 (diff)
downloadorg.eclipse.ecf-6ac280d43c07a834560e61c73278cd415cacf512.tar.gz
org.eclipse.ecf-6ac280d43c07a834560e61c73278cd415cacf512.tar.xz
org.eclipse.ecf-6ac280d43c07a834560e61c73278cd415cacf512.zip
Fix for https://bugs.eclipse.org/bugs/show_bug.cgi?id=539469
-rw-r--r--framework/bundles/org.eclipse.ecf.remoteservice.asyncproxy/META-INF/MANIFEST.MF2
-rw-r--r--framework/bundles/org.eclipse.ecf.remoteservice.asyncproxy/pom.xml2
-rw-r--r--framework/bundles/org.eclipse.ecf.remoteservice.asyncproxy/src/org/eclipse/ecf/remoteservice/asyncproxy/AbstractAsyncProxyRemoteService.java7
3 files changed, 9 insertions, 2 deletions
diff --git a/framework/bundles/org.eclipse.ecf.remoteservice.asyncproxy/META-INF/MANIFEST.MF b/framework/bundles/org.eclipse.ecf.remoteservice.asyncproxy/META-INF/MANIFEST.MF
index 0cf892646..b2f674fd2 100644
--- a/framework/bundles/org.eclipse.ecf.remoteservice.asyncproxy/META-INF/MANIFEST.MF
+++ b/framework/bundles/org.eclipse.ecf.remoteservice.asyncproxy/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
Bundle-Name: %bundle.name
Bundle-SymbolicName: org.eclipse.ecf.remoteservice.asyncproxy
Automatic-Module-Name: org.eclipse.ecf.remoteservice.asyncproxy
-Bundle-Version: 1.1.0.qualifier
+Bundle-Version: 1.1.100.qualifier
Bundle-Vendor: %bundle.provider
Import-Package: org.eclipse.equinox.concurrent.future
Bundle-Localization: bundle
diff --git a/framework/bundles/org.eclipse.ecf.remoteservice.asyncproxy/pom.xml b/framework/bundles/org.eclipse.ecf.remoteservice.asyncproxy/pom.xml
index 7cc0a5f49..137fac47e 100644
--- a/framework/bundles/org.eclipse.ecf.remoteservice.asyncproxy/pom.xml
+++ b/framework/bundles/org.eclipse.ecf.remoteservice.asyncproxy/pom.xml
@@ -10,6 +10,6 @@
</parent>
<groupId>org.eclipse.ecf</groupId>
<artifactId>org.eclipse.ecf.remoteservice.asyncproxy</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <version>1.1.100-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/framework/bundles/org.eclipse.ecf.remoteservice.asyncproxy/src/org/eclipse/ecf/remoteservice/asyncproxy/AbstractAsyncProxyRemoteService.java b/framework/bundles/org.eclipse.ecf.remoteservice.asyncproxy/src/org/eclipse/ecf/remoteservice/asyncproxy/AbstractAsyncProxyRemoteService.java
index 7e53b6f75..c30f9715e 100644
--- a/framework/bundles/org.eclipse.ecf.remoteservice.asyncproxy/src/org/eclipse/ecf/remoteservice/asyncproxy/AbstractAsyncProxyRemoteService.java
+++ b/framework/bundles/org.eclipse.ecf.remoteservice.asyncproxy/src/org/eclipse/ecf/remoteservice/asyncproxy/AbstractAsyncProxyRemoteService.java
@@ -10,6 +10,7 @@
*****************************************************************************/
package org.eclipse.ecf.remoteservice.asyncproxy;
+import java.lang.reflect.Method;
import java.util.concurrent.Future;
import org.eclipse.equinox.concurrent.future.IFuture;
@@ -24,6 +25,12 @@ public abstract class AbstractAsyncProxyRemoteService {
protected abstract void callCompletableAsync(AbstractAsyncProxyRemoteCall call, IAsyncProxyCompletable completable);
+ protected boolean isReturnAsync(Object proxy, Method method, Object[] args) {
+ @SuppressWarnings("rawtypes")
+ Class returnType = method.getReturnType();
+ return (Future.class.isAssignableFrom(returnType) || IFuture.class.isAssignableFrom(returnType));
+ }
+
protected Object callFuture(AbstractAsyncProxyRemoteCall call, @SuppressWarnings("rawtypes") Class returnType) {
// Iff it's an IFuture then return
// IFuture result of callAsync

Back to the top