diff options
Diffstat (limited to 'framework')
3 files changed, 7 insertions, 25 deletions
diff --git a/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/generic/GenericContainerInstantiator.java b/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/generic/GenericContainerInstantiator.java index d09fda2ca..32650c77b 100644 --- a/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/generic/GenericContainerInstantiator.java +++ b/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/generic/GenericContainerInstantiator.java @@ -27,7 +27,7 @@ public class GenericContainerInstantiator implements IContainerInstantiator, IRe /** * @since 2.0 */ - protected static final String[] genericProviderIntents = {"osgi.basic", "passByValue", "exactlyOnce", "ordered"}; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + protected static final String[] genericProviderIntents = {"passByValue", "exactlyOnce", "ordered",}; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ public static final String TCPCLIENT_NAME = "ecf.generic.client"; //$NON-NLS-1$ diff --git a/framework/bundles/org.eclipse.ecf.remoteservice.asyncproxy.j8/META-INF/MANIFEST.MF b/framework/bundles/org.eclipse.ecf.remoteservice.asyncproxy.j8/META-INF/MANIFEST.MF index eb24c16e2..e0388a1e8 100644 --- a/framework/bundles/org.eclipse.ecf.remoteservice.asyncproxy.j8/META-INF/MANIFEST.MF +++ b/framework/bundles/org.eclipse.ecf.remoteservice.asyncproxy.j8/META-INF/MANIFEST.MF @@ -5,8 +5,7 @@ Bundle-SymbolicName: org.eclipse.ecf.remoteservice.asyncproxy Automatic-Module-Name: org.eclipse.ecf.remoteservice.asyncproxy Bundle-Version: 2.0.200.qualifier Bundle-Vendor: %bundle.provider -Import-Package: org.eclipse.equinox.concurrent.future, - org.osgi.util.promise +Import-Package: org.eclipse.equinox.concurrent.future Bundle-Localization: bundle Export-Package: org.eclipse.ecf.remoteservice.asyncproxy;version="2.0.0" Bundle-RequiredExecutionEnvironment: JavaSE-1.8 diff --git a/framework/bundles/org.eclipse.ecf.remoteservice.asyncproxy.j8/src/org/eclipse/ecf/remoteservice/asyncproxy/AbstractAsyncProxyRemoteService.java b/framework/bundles/org.eclipse.ecf.remoteservice.asyncproxy.j8/src/org/eclipse/ecf/remoteservice/asyncproxy/AbstractAsyncProxyRemoteService.java index 5ab531bed..c3c96a3d2 100644 --- a/framework/bundles/org.eclipse.ecf.remoteservice.asyncproxy.j8/src/org/eclipse/ecf/remoteservice/asyncproxy/AbstractAsyncProxyRemoteService.java +++ b/framework/bundles/org.eclipse.ecf.remoteservice.asyncproxy.j8/src/org/eclipse/ecf/remoteservice/asyncproxy/AbstractAsyncProxyRemoteService.java @@ -11,12 +11,9 @@ package org.eclipse.ecf.remoteservice.asyncproxy; import java.util.concurrent.CompletableFuture; -import java.util.concurrent.CompletionStage; import java.util.concurrent.Future; import org.eclipse.equinox.concurrent.future.IFuture; -import org.osgi.util.promise.Deferred; -import org.osgi.util.promise.Promise; public abstract class AbstractAsyncProxyRemoteService { @@ -32,30 +29,16 @@ public abstract class AbstractAsyncProxyRemoteService { protected Object callFuture(AbstractAsyncProxyRemoteCall call, @SuppressWarnings("rawtypes") Class returnType) { // If the result value is a CompletableFuture then // we callCompletableAsync - if (CompletableFuture.class.isAssignableFrom(returnType) - || CompletionStage.class.isAssignableFrom(returnType)) { + if (CompletableFuture.class.isAssignableFrom(returnType)) { @SuppressWarnings("rawtypes") - CompletableFuture result = new CompletableFuture(); - callCompletableAsync(call, (r, hadException, exception) -> { - if (hadException) - result.completeExceptionally(exception); - else - result.complete(r); + CompletableFuture result = new CompletableFuture(); + callCompletableAsync(call, (r,hadException,exception) -> { + if (hadException) result.completeExceptionally(exception); + else result.complete(r); }); // And return the CompletableFuture return result; } - if (Promise.class.isAssignableFrom(returnType)) { - @SuppressWarnings("rawtypes") - Deferred d = new Deferred(); - callCompletableAsync(call, (r, hadException, exception) -> { - if (hadException) - d.fail(exception); - else - d.resolve(r); - }); - return d.getPromise(); - } // Else if it's an IFuture then return // IFuture result of callAsync if (IFuture.class.isAssignableFrom(returnType)) |