Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Watson2016-06-30 09:37:07 -0400
committerThomas Watson2016-06-30 09:37:07 -0400
commitf3f06f18440d1c46ea20a67a5ae2b6da0c6597c3 (patch)
tree0d518f07e9bd1902416d5c67843d7bf79bec0013
parente61a1e132ba16efebeef4a25d635e56d5e1c7824 (diff)
downloadrt.equinox.p2-f3f06f18440d1c46ea20a67a5ae2b6da0c6597c3.tar.gz
rt.equinox.p2-f3f06f18440d1c46ea20a67a5ae2b6da0c6597c3.tar.xz
rt.equinox.p2-f3f06f18440d1c46ea20a67a5ae2b6da0c6597c3.zip
Change-Id: I18e56f297188c32a412127da36d4917bf1cc9944 Signed-off-by: Thomas Watson <tjwatson@us.ibm.com>
-rw-r--r--bundles/org.eclipse.equinox.simpleconfigurator/src/org/eclipse/equinox/internal/simpleconfigurator/ConfigApplier.java13
1 files changed, 8 insertions, 5 deletions
diff --git a/bundles/org.eclipse.equinox.simpleconfigurator/src/org/eclipse/equinox/internal/simpleconfigurator/ConfigApplier.java b/bundles/org.eclipse.equinox.simpleconfigurator/src/org/eclipse/equinox/internal/simpleconfigurator/ConfigApplier.java
index 32d079256..84352f7ee 100644
--- a/bundles/org.eclipse.equinox.simpleconfigurator/src/org/eclipse/equinox/internal/simpleconfigurator/ConfigApplier.java
+++ b/bundles/org.eclipse.equinox.simpleconfigurator/src/org/eclipse/equinox/internal/simpleconfigurator/ConfigApplier.java
@@ -397,11 +397,14 @@ class ConfigApplier {
Set<Bundle> allSameBSNs = new LinkedHashSet<Bundle>(); // maintain order and avoid duplicates
for (Bundle bundle : bundles) {
allSameBSNs.add(bundle);
- // look for others with same BSN
- Bundle[] sameBSNs = packageAdminService.getBundles(bundle.getSymbolicName(), null);
- if (sameBSNs != null) {
- // likely contains the bundle we just added above but a set is used
- allSameBSNs.addAll(Arrays.asList(sameBSNs));
+ String bsn = bundle.getLocation();
+ if (bsn != null) {
+ // look for others with same BSN
+ Bundle[] sameBSNs = packageAdminService.getBundles(bsn, null);
+ if (sameBSNs != null) {
+ // likely contains the bundle we just added above but a set is used
+ allSameBSNs.addAll(Arrays.asList(sameBSNs));
+ }
}
}

Back to the top