diff options
author | Thomas Watson | 2016-06-30 13:37:07 +0000 |
---|---|---|
committer | Thomas Watson | 2016-06-30 13:37:07 +0000 |
commit | f3f06f18440d1c46ea20a67a5ae2b6da0c6597c3 (patch) | |
tree | 0d518f07e9bd1902416d5c67843d7bf79bec0013 | |
parent | e61a1e132ba16efebeef4a25d635e56d5e1c7824 (diff) | |
download | rt.equinox.p2-f3f06f18440d1c46ea20a67a5ae2b6da0c6597c3.tar.gz rt.equinox.p2-f3f06f18440d1c46ea20a67a5ae2b6da0c6597c3.tar.xz rt.equinox.p2-f3f06f18440d1c46ea20a67a5ae2b6da0c6597c3.zip |
Bug 497094 - Check for no symbolic name before calling PackageAdminY20160811-1000Y20160804-1000Y20160728-1000Y20160721-1000Y20160714-1000Y20160707-1000I20160809-1300I20160809-1100I20160803-2000I20160803-0800I20160802-2000I20160802-0800I20160801-2000I20160801-0800I20160731-2000I20160726-1400I20160726-0800I20160719-0800I20160716-1900I20160712-1000I20160712-0800I20160708-1700I20160705-1600
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.java | 13 |
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)); + } } } |