Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorslewis2015-11-06 00:57:49 +0000
committerslewis2015-11-06 00:57:49 +0000
commitecf6e5fc04d84fdfee4c7e83591d90d6ead614f3 (patch)
treef474d5b3dd9231600a5aa437d29f4013438ed168
parent30a13f92ffe26699dd490fda9479e35f2d5e9ef3 (diff)
downloadorg.eclipse.ecf-ecf6e5fc04d84fdfee4c7e83591d90d6ead614f3.tar.gz
org.eclipse.ecf-ecf6e5fc04d84fdfee4c7e83591d90d6ead614f3.tar.xz
org.eclipse.ecf-ecf6e5fc04d84fdfee4c7e83591d90d6ead614f3.zip
Fix for bug https://bugs.eclipse.org/bugs/show_bug.cgi?id=481556
-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/internal/osgi/services/remoteserviceadmin/Activator.java4
2 files changed, 3 insertions, 3 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 243e4ea5b..4ccbe94e3 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.100.qualifier
+Bundle-Version: 4.3.200.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/internal/osgi/services/remoteserviceadmin/Activator.java b/osgi/bundles/org.eclipse.ecf.osgi.services.remoteserviceadmin/src/org/eclipse/ecf/internal/osgi/services/remoteserviceadmin/Activator.java
index 14f13f7f5..740e6cbdc 100644
--- a/osgi/bundles/org.eclipse.ecf.osgi.services.remoteserviceadmin/src/org/eclipse/ecf/internal/osgi/services/remoteserviceadmin/Activator.java
+++ b/osgi/bundles/org.eclipse.ecf.osgi.services.remoteserviceadmin/src/org/eclipse/ecf/internal/osgi/services/remoteserviceadmin/Activator.java
@@ -172,9 +172,9 @@ public class Activator implements BundleActivator {
if (!rcs.contains(descSupportedConfigs[j])) rcs.add(descSupportedConfigs[j]);
// Get supported intents
String[] descSupportedIntents = desc.getSupportedIntents();
- // Add them all
+ // Add them if not already present
for (int j = 0; j < descSupportedIntents.length; j++)
- ris.add(descSupportedIntents[j]);
+ if (!ris.contains(descSupportedIntents[j])) ris.add(descSupportedIntents[j]);
}
// set rsaProps to new values
rsaProps.put(org.osgi.service.remoteserviceadmin.RemoteConstants.REMOTE_CONFIGS_SUPPORTED, rcs.toArray(new String[rcs.size()]));

Back to the top