Simplification of API for checking for existence of osgi.async intent on

IRemoteServiceReferences.

Change-Id: Id15b6f932eb746dd569c4eba4fbd2540acd7da72

1 files changed, 10 insertions, 1 deletions

diff --git a/protocols/bundles/ch.ethz.iks.r_osgi.remote/src/main/java/ch/ethz/iks/r_osgi/impl/RemoteServiceRegistration.java b/protocols/bundles/ch.ethz.iks.r_osgi.remote/src/main/java/ch/ethz/iks/r_osgi/impl/RemoteServiceRegistration.java
index f4e98167f..9f42cf876 100644
--- a/protocols/bundles/ch.ethz.iks.r_osgi.remote/src/main/java/ch/ethz/iks/r_osgi/impl/RemoteServiceRegistration.java
+++ b/protocols/bundles/ch.ethz.iks.r_osgi.remote/src/main/java/ch/ethz/iks/r_osgi/impl/RemoteServiceRegistration.java
@@ -29,6 +29,7 @@
 package ch.ethz.iks.r_osgi.impl;
 
 import java.lang.reflect.Method;
+import java.util.Arrays;
 import java.util.Dictionary;
 import java.util.HashMap;
 import java.util.Hashtable;
@@ -160,7 +161,15 @@ final class RemoteServiceRegistration {
 	}
 
 	boolean isOSGiAsync() {
-		return reference.getProperty(OSGI_ASYNC) != null;
+		Object o = reference.getProperty(OSGI_ASYNC);
+		if (o != null)
+			return true;
+		// If service.intents has values, and the osgi.async is present then it's also yes
+		String[] serviceIntents = (String[]) reference.getProperty("service.intents");
+		if (serviceIntents != null && Arrays.asList(serviceIntents).contains("osgi.async"))
+			return true;
+		// otherwise no
+		return false;
 	}
 	
 	long getOSGiTimeout() {