Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorslewis2018-03-08 18:17:18 -0500
committerslewis2018-03-08 18:17:18 -0500
commitf1384a6d3068160830d90678c5ba8237da3d41d9 (patch)
tree7430899637be57aaf4c8f1e00b4f67ac9cc539af /framework/bundles
parentb0848978069212a0aa377ccb47f59d73ad5e75dd (diff)
downloadorg.eclipse.ecf-f1384a6d3068160830d90678c5ba8237da3d41d9.tar.gz
org.eclipse.ecf-f1384a6d3068160830d90678c5ba8237da3d41d9.tar.xz
org.eclipse.ecf-f1384a6d3068160830d90678c5ba8237da3d41d9.zip
for bug https://bugs.eclipse.org/bugs/show_bug.cgi?id=532205
Added support for new intents handling and intents properties handling in RSA impl. Change-Id: I0a71ec9eb77e8ac78037a545aa815dc1aea5c397
Diffstat (limited to 'framework/bundles')
-rw-r--r--framework/bundles/org.eclipse.ecf.remoteservice/META-INF/MANIFEST.MF2
-rw-r--r--framework/bundles/org.eclipse.ecf.remoteservice/pom.xml2
-rw-r--r--framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/AbstractRemoteService.java22
-rw-r--r--framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/Constants.java21
-rw-r--r--framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/client/AbstractRSAClientService.java2
5 files changed, 43 insertions, 6 deletions
diff --git a/framework/bundles/org.eclipse.ecf.remoteservice/META-INF/MANIFEST.MF b/framework/bundles/org.eclipse.ecf.remoteservice/META-INF/MANIFEST.MF
index 27b13896e..b83913cb5 100644
--- a/framework/bundles/org.eclipse.ecf.remoteservice/META-INF/MANIFEST.MF
+++ b/framework/bundles/org.eclipse.ecf.remoteservice/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
Bundle-Name: %plugin.name
Bundle-SymbolicName: org.eclipse.ecf.remoteservice
Automatic-Module-Name: org.eclipse.ecf.remoteservice
-Bundle-Version: 8.12.100.qualifier
+Bundle-Version: 8.13.0.qualifier
Bundle-Activator: org.eclipse.ecf.internal.remoteservice.Activator
Bundle-Vendor: %plugin.provider
Bundle-Localization: plugin
diff --git a/framework/bundles/org.eclipse.ecf.remoteservice/pom.xml b/framework/bundles/org.eclipse.ecf.remoteservice/pom.xml
index b9bd950c2..6579899f9 100644
--- a/framework/bundles/org.eclipse.ecf.remoteservice/pom.xml
+++ b/framework/bundles/org.eclipse.ecf.remoteservice/pom.xml
@@ -10,6 +10,6 @@
</parent>
<groupId>org.eclipse.ecf</groupId>
<artifactId>org.eclipse.ecf.remoteservice</artifactId>
- <version>8.12.100-SNAPSHOT</version>
+ <version>8.13.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
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 241fa6779..b48f78a0e 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
@@ -117,8 +117,24 @@ public abstract class AbstractRemoteService extends AbstractAsyncProxyRemoteServ
return this;
}
+ private Long defaultTimeout;
+
protected long getDefaultTimeout() {
- return IRemoteCall.DEFAULT_TIMEOUT;
+ synchronized (this) {
+ if (defaultTimeout == null) {
+ Object o = getRemoteServiceReference().getProperty(Constants.OSGI_BASIC_TIMEOUT_INTENT);
+ if (o != null) {
+ if (o instanceof Long)
+ defaultTimeout = (Long) o;
+ else if (o instanceof Integer)
+ defaultTimeout = ((Integer) o).longValue();
+ else if (o instanceof String)
+ defaultTimeout = Long.valueOf((String) o);
+ } else
+ defaultTimeout = IRemoteCall.DEFAULT_TIMEOUT;
+ }
+ }
+ return defaultTimeout;
}
@Override
@@ -339,7 +355,7 @@ public abstract class AbstractRemoteService extends AbstractAsyncProxyRemoteServ
}
protected long getCallTimeoutForProxyInvoke(String callMethod, Method proxyMethod, Object[] args) {
- return IRemoteCall.DEFAULT_TIMEOUT;
+ return getDefaultTimeout();
}
protected String getCallMethodNameForProxyInvoke(Method method, Object[] args) {
@@ -520,7 +536,7 @@ public abstract class AbstractRemoteService extends AbstractAsyncProxyRemoteServ
* @return RemoteCall remote call created. Should not be <code>null</code>
*/
protected RemoteCall getAsyncRemoteCall(String invokeMethodName, Object[] asyncArgs) {
- return new RemoteCall(invokeMethodName, asyncArgs, IRemoteCall.DEFAULT_TIMEOUT);
+ return new RemoteCall(invokeMethodName, asyncArgs, getDefaultTimeout());
}
/**
diff --git a/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/Constants.java b/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/Constants.java
index 4b5c876a2..fe68bd38b 100644
--- a/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/Constants.java
+++ b/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/Constants.java
@@ -420,4 +420,25 @@ public interface Constants {
*/
public static final String OSGI_CONTAINER_ID_NS = "ecf.osgi.ns"; //$NON-NLS-1$
+ /**
+ * @since 8.13
+ */
+ public static final String OSGI_BASIC_INTENT = "osgi.basic"; //$NON-NLS-1$
+ /**
+ * @since 8.13
+ */
+ public static final String OSGI_BASIC_TIMEOUT_INTENT = "osgi.basic.timeout"; //$NON-NLS-1$
+ /**
+ * @since 8.13
+ */
+ public static final String OSGI_ASYNC_INTENT = "osgi.async"; //$NON-NLS-1$
+ /**
+ * @since 8.13
+ */
+ public static final String OSGI_CONFIDENTIAL_INTENT = "osgi.confidential"; //$NON-NLS-1$
+ /**
+ * @since 8.13
+ */
+ public static final String OSGI_PRIVATE_INTENT = "osgi.private"; //$NON-NLS-1$
+
}
diff --git a/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/client/AbstractRSAClientService.java b/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/client/AbstractRSAClientService.java
index b5cd74514..39ded4c48 100644
--- a/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/client/AbstractRSAClientService.java
+++ b/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/client/AbstractRSAClientService.java
@@ -90,7 +90,7 @@ public abstract class AbstractRSAClientService extends AbstractClientService {
if (resultObject != null)
return resultObject;
if (isAsync(proxy, method, args))
- return invokeAsync(createRemoteCall(proxy, method, getAsyncInvokeMethodName(method), args, IRemoteCall.DEFAULT_TIMEOUT));
+ return invokeAsync(createRemoteCall(proxy, method, getAsyncInvokeMethodName(method), args, getDefaultTimeout()));
final String callMethod = getCallMethodNameForProxyInvoke(method, args);
final Object[] callParameters = getCallParametersForProxyInvoke(callMethod, method, args);
final long callTimeout = getCallTimeoutForProxyInvoke(callMethod, method, args);

Back to the top