Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorslewis2018-04-06 15:15:57 -0400
committerslewis2018-04-06 15:15:57 -0400
commit36a53be07e74f800d9e3a8baa93b99d03ff0f0bd (patch)
tree5250a56822ca5d98fbe93b812d1a1214e184a21d /providers/bundles
parent1e55810220d5c6fab6741707d4beef67a18da94a (diff)
downloadorg.eclipse.ecf-36a53be07e74f800d9e3a8baa93b99d03ff0f0bd.tar.gz
org.eclipse.ecf-36a53be07e74f800d9e3a8baa93b99d03ff0f0bd.tar.xz
org.eclipse.ecf-36a53be07e74f800d9e3a8baa93b99d03ff0f0bd.zip
Simplification of API for checking for existence of osgi.async intent on
IRemoteServiceReferences. Change-Id: Id15b6f932eb746dd569c4eba4fbd2540acd7da72
Diffstat (limited to 'providers/bundles')
-rw-r--r--providers/bundles/org.eclipse.ecf.provider.remoteservice/src/org/eclipse/ecf/provider/remoteservice/generic/RegistrySharedObject.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/providers/bundles/org.eclipse.ecf.provider.remoteservice/src/org/eclipse/ecf/provider/remoteservice/generic/RegistrySharedObject.java b/providers/bundles/org.eclipse.ecf.provider.remoteservice/src/org/eclipse/ecf/provider/remoteservice/generic/RegistrySharedObject.java
index 616fdf47a..a5d539b63 100644
--- a/providers/bundles/org.eclipse.ecf.provider.remoteservice/src/org/eclipse/ecf/provider/remoteservice/generic/RegistrySharedObject.java
+++ b/providers/bundles/org.eclipse.ecf.provider.remoteservice/src/org/eclipse/ecf/provider/remoteservice/generic/RegistrySharedObject.java
@@ -30,6 +30,7 @@ import org.eclipse.ecf.internal.provider.remoteservice.IRemoteServiceProviderDeb
import org.eclipse.ecf.remoteservice.*;
import org.eclipse.ecf.remoteservice.asyncproxy.AsyncReturnUtil;
import org.eclipse.ecf.remoteservice.events.*;
+import org.eclipse.ecf.remoteservice.util.AsyncUtil;
import org.eclipse.equinox.concurrent.future.*;
import org.eclipse.osgi.framework.eventmgr.*;
import org.osgi.framework.InvalidSyntaxException;
@@ -1460,7 +1461,7 @@ public class RegistrySharedObject extends BaseSharedObject implements IRemoteSer
if (result != null) {
Class returnType = method.getReturnType();
// provider must expose osgi.async property and must be async return type
- if (reg.getProperty(Constants.OSGI_ASYNC_INTENT) != null && AsyncReturnUtil.isAsyncType(returnType))
+ if (AsyncUtil.isOSGIAsync(reg.getReference()) && AsyncReturnUtil.isAsyncType(returnType))
return AsyncReturnUtil.convertAsyncToReturn(result, returnType, call.getTimeout());
}
return result;

Back to the top