commit | 9fc93ffa55ba9afe7b4d3543be328fd945767a05 | [log] [tgz] |
---|---|---|
author | slewis <slewis@composent.com> | Wed Jul 13 18:50:58 2016 -0700 |
committer | slewis <slewis@composent.com> | Wed Jul 13 18:50:58 2016 -0700 |
tree | db04f4d69980f647d745a830ce429e80e020519c | |
parent | 776337dc03b16f21aacb4b65207f52c4312828af [diff] |
Fix for bug https://bugs.eclipse.org/bugs/show_bug.cgi?id=497876 Change-Id: I15627ca275c5bd396638ad94304593c6e1712afe
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 1085b37..d43ca10 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.1.qualifier +Bundle-Version: 4.4.2.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 b4d73e0..56a1d49 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
@@ -2275,9 +2275,8 @@ .put(org.osgi.service.remoteserviceadmin.RemoteConstants.SERVICE_IMPORTED, new Boolean(true)); - String[] exporterSupportedConfigs = (String[]) endpointDescription - .getProperties() - .get(org.osgi.service.remoteserviceadmin.RemoteConstants.REMOTE_CONFIGS_SUPPORTED); + String[] exporterSupportedConfigs = PropertiesUtil.getStringArrayFromPropertyValue(endpointDescription.getProperties().get(org.osgi.service.remoteserviceadmin.RemoteConstants.REMOTE_CONFIGS_SUPPORTED)); + String[] importedConfigs = getImportedConfigs(importContainerID, exporterSupportedConfigs); // Set service.imported.configs resultProperties