| commit | 776337dc03b16f21aacb4b65207f52c4312828af | [log] [tgz] |
|---|---|---|
| author | slewis <slewis@composent.com> | Tue Jun 28 16:33:13 2016 -0700 |
| committer | slewis <slewis@composent.com> | Tue Jun 28 16:33:13 2016 -0700 |
| tree | bd5ed0b36a86680a695ea3f0bd8426b8401e51ee | |
| parent | 17a86f0d20a9ae66887c19e2c20a417978e2606c [diff] |
Fix for https://bugs.eclipse.org/bugs/show_bug.cgi?id=496963 Change-Id: I2d55b67b665086b6fb0d36dd6a9d3507dec3a584
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 60d39dc..1085b37 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 @@ Bundle-ManifestVersion: 2 Bundle-Name: %bundle.name Bundle-SymbolicName: org.eclipse.ecf.osgi.services.remoteserviceadmin -Bundle-Version: 4.4.0.qualifier +Bundle-Version: 4.4.1.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/AbstractConsumerContainerSelector.java b/osgi/bundles/org.eclipse.ecf.osgi.services.remoteserviceadmin/src/org/eclipse/ecf/osgi/services/remoteserviceadmin/AbstractConsumerContainerSelector.java index e141740..9955cca 100644 --- a/osgi/bundles/org.eclipse.ecf.osgi.services.remoteserviceadmin/src/org/eclipse/ecf/osgi/services/remoteserviceadmin/AbstractConsumerContainerSelector.java +++ b/osgi/bundles/org.eclipse.ecf.osgi.services.remoteserviceadmin/src/org/eclipse/ecf/osgi/services/remoteserviceadmin/AbstractConsumerContainerSelector.java
@@ -105,7 +105,8 @@ ContainerTypeDescription description = getContainerTypeDescription(container); if (description == null) return false; - return description.getImportedConfigs(remoteSupportedConfigs) != null; + String[] importedConfigs = description.getImportedConfigs(remoteSupportedConfigs); + return (importedConfigs == null || importedConfigs.length == 0)?false:true; } protected void connectContainerToTarget(