Skip to main content
aboutsummaryrefslogtreecommitdiffstats
path: root/osgi
diff options
context:
space:
mode:
authorslewis2015-07-07 21:58:29 +0000
committerslewis2015-07-07 21:58:29 +0000
commit06239b41cda8e90ba6508350846c306f70ad0a49 (patch)
tree7d9318625f8c2d686e82967de327d2dba4428d79 /osgi
parent4c7ecd62e0c8f413dc9f5b7a10d4ffdb21de9f30 (diff)
downloadorg.eclipse.ecf-06239b41cda8e90ba6508350846c306f70ad0a49.tar.gz
org.eclipse.ecf-06239b41cda8e90ba6508350846c306f70ad0a49.tar.xz
org.eclipse.ecf-06239b41cda8e90ba6508350846c306f70ad0a49.zip
Fix for https://bugs.eclipse.org/bugs/show_bug.cgi?id=472106
Diffstat (limited to 'osgi')
-rw-r--r--osgi/bundles/org.eclipse.ecf.osgi.services.remoteserviceadmin/META-INF/MANIFEST.MF2
-rw-r--r--osgi/bundles/org.eclipse.ecf.osgi.services.remoteserviceadmin/src/org/eclipse/ecf/osgi/services/remoteserviceadmin/RemoteServiceAdmin.java11
2 files changed, 12 insertions, 1 deletions
diff --git a/osgi/bundles/org.eclipse.ecf.osgi.services.remoteserviceadmin/META-INF/MANIFEST.MF b/osgi/bundles/org.eclipse.ecf.osgi.services.remoteserviceadmin/META-INF/MANIFEST.MF
index 3175b7eac..243e4ea5b 100644
--- a/osgi/bundles/org.eclipse.ecf.osgi.services.remoteserviceadmin/META-INF/MANIFEST.MF
+++ b/osgi/bundles/org.eclipse.ecf.osgi.services.remoteserviceadmin/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %bundle.name
Bundle-SymbolicName: org.eclipse.ecf.osgi.services.remoteserviceadmin
-Bundle-Version: 4.3.0.qualifier
+Bundle-Version: 4.3.100.qualifier
Bundle-Activator: org.eclipse.ecf.internal.osgi.services.remoteserviceadmin.Activator
Bundle-Vendor: %bundle.provider
Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/osgi/bundles/org.eclipse.ecf.osgi.services.remoteserviceadmin/src/org/eclipse/ecf/osgi/services/remoteserviceadmin/RemoteServiceAdmin.java b/osgi/bundles/org.eclipse.ecf.osgi.services.remoteserviceadmin/src/org/eclipse/ecf/osgi/services/remoteserviceadmin/RemoteServiceAdmin.java
index 76dcd5d42..0e0fd15a8 100644
--- a/osgi/bundles/org.eclipse.ecf.osgi.services.remoteserviceadmin/src/org/eclipse/ecf/osgi/services/remoteserviceadmin/RemoteServiceAdmin.java
+++ b/osgi/bundles/org.eclipse.ecf.osgi.services.remoteserviceadmin/src/org/eclipse/ecf/osgi/services/remoteserviceadmin/RemoteServiceAdmin.java
@@ -89,6 +89,11 @@ public class RemoteServiceAdmin implements
public static final String SERVICE_PROP = "org.eclipse.ecf.rsa"; //$NON-NLS-1$
+ private static final boolean disableServiceVersionChecking = new Boolean(
+ System.getProperty(
+ "org.eclipse.ecf.osgi.services.remoteserviceadmin.disableServiceVersionChecking", //$NON-NLS-1$
+ "false")).booleanValue(); //$NON-NLS-1$
+
private Bundle clientBundle;
private boolean hostAutoCreateContainer = new Boolean(
@@ -1992,6 +1997,12 @@ public class RemoteServiceAdmin implements
Collection<Class> classes, Map<String, Version> interfaceVersions) {
// For all service interface classes
boolean result = true;
+ // For enhancement https://bugs.eclipse.org/bugs/show_bug.cgi?id=472106
+ if (disableServiceVersionChecking) {
+ logWarning("verifyServiceInterfaceVersionsForProxy", //$NON-NLS-1$
+ "Service version checking disabled via service property"); //$NON-NLS-1$
+ return result;
+ }
for (Class clazz : classes) {
String className = clazz.getName();
String packageName = getPackageName(className);

Back to the top