diff options
| author | Thomas Watson | 2016-06-30 13:37:07 +0000 |
|---|---|---|
| committer | Thomas Watson | 2018-01-30 17:41:03 +0000 |
| commit | 4d56c14d01f7c4879341e9e660eb8521f6ee54ca (patch) | |
| tree | b30daefc3c217b17529be41605b4faab09930c8c | |
| parent | 6696fed956cfe01c76f9adceb1fbd1b088a35621 (diff) | |
| download | rt.equinox.p2-4d56c14d01f7c4879341e9e660eb8521f6ee54ca.tar.gz rt.equinox.p2-4d56c14d01f7c4879341e9e660eb8521f6ee54ca.tar.xz rt.equinox.p2-4d56c14d01f7c4879341e9e660eb8521f6ee54ca.zip | |
Bug 497094 - Check for no symbolic name before calling PackageAdmin
Change-Id: I18e56f297188c32a412127da36d4917bf1cc9944
Signed-off-by: Thomas Watson <tjwatson@us.ibm.com>
3 files changed, 10 insertions, 7 deletions
diff --git a/bundles/org.eclipse.equinox.simpleconfigurator/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.simpleconfigurator/META-INF/MANIFEST.MF index d0b5ae601..2a9ade2f5 100644 --- a/bundles/org.eclipse.equinox.simpleconfigurator/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.equinox.simpleconfigurator/META-INF/MANIFEST.MF @@ -1,7 +1,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.equinox.simpleconfigurator;singleton:=true -Bundle-Version: 1.1.200.qualifier +Bundle-Version: 1.1.201.qualifier Bundle-Name: %bundleName Bundle-Vendor: %providerName Bundle-Localization: plugin diff --git a/bundles/org.eclipse.equinox.simpleconfigurator/pom.xml b/bundles/org.eclipse.equinox.simpleconfigurator/pom.xml index c0624fa11..d44990897 100644 --- a/bundles/org.eclipse.equinox.simpleconfigurator/pom.xml +++ b/bundles/org.eclipse.equinox.simpleconfigurator/pom.xml @@ -9,6 +9,6 @@ </parent> <groupId>org.eclipse.equinox</groupId> <artifactId>org.eclipse.equinox.simpleconfigurator</artifactId> - <version>1.1.200-SNAPSHOT</version> + <version>1.1.201-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> </project> 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..200848e79 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.getSymbolicName(); + 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)); + } } } |