Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorslewis2018-04-04 19:45:15 -0400
committerslewis2018-04-04 19:45:15 -0400
commit1e55810220d5c6fab6741707d4beef67a18da94a (patch)
tree5034456f706df9d0c4016b48051dd9cc51d5bac7 /framework/bundles
parented75d1ba124aa05c98cad16b67154500502d5ee0 (diff)
downloadorg.eclipse.ecf-1e55810220d5c6fab6741707d4beef67a18da94a.tar.gz
org.eclipse.ecf-1e55810220d5c6fab6741707d4beef67a18da94a.tar.xz
org.eclipse.ecf-1e55810220d5c6fab6741707d4beef67a18da94a.zip
Added handling of service.intents for determining if osgi.async intent
is present. Also added debug output info for host container selector service Change-Id: Ib55613fd9714801a415c5d4e3f2cff038bc03536
Diffstat (limited to 'framework/bundles')
-rw-r--r--framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/AbstractRemoteService.java15
-rw-r--r--framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/SharedObjectMsgEvent.java3
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();
}

Back to the top