diff options
Diffstat (limited to 'framework/bundles')
2 files changed, 17 insertions, 1 deletions
diff --git a/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/AbstractRemoteService.java b/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/AbstractRemoteService.java index 51b8c818a..51dec6acc 100644 --- a/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/AbstractRemoteService.java +++ b/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/AbstractRemoteService.java @@ -468,7 +468,20 @@ public abstract class AbstractRemoteService extends AbstractAsyncProxyRemoteServ * @since 8.13 */ protected boolean isOSGIAsync() { - return getRemoteServiceReference().getProperty(Constants.OSGI_ASYNC_INTENT) != null; + IRemoteServiceReference ref = getRemoteServiceReference(); + // If osgi.async is set then it's yes + boolean osgiAsync = ref.getProperty(Constants.OSGI_ASYNC_INTENT) != null; + if (osgiAsync) + return true; + // If service.intents has values, and the osgi.async is present then it's also yes + String[] serviceIntents = (String[]) ref.getProperty(Constants.OSGI_SERVICE_INTENTS); + if (serviceIntents != null) { + List<String> il = Arrays.asList(serviceIntents); + if (il.contains(Constants.OSGI_ASYNC_INTENT)) + return true; + } + // otherwise no + return false; } /** diff --git a/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/SharedObjectMsgEvent.java b/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/SharedObjectMsgEvent.java index a7f066159..3f5c18b42 100644 --- a/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/SharedObjectMsgEvent.java +++ b/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/SharedObjectMsgEvent.java @@ -22,6 +22,9 @@ public class SharedObjectMsgEvent extends RemoteSharedObjectEvent { private static final long serialVersionUID = -8674874265514762123L; + /** + * @since 2.6 + */ public SharedObjectMsgEvent() { super(); } |