diff options
author | Thomas Watson | 2018-01-19 14:21:19 +0000 |
---|---|---|
committer | Thomas Watson | 2018-01-31 14:35:07 +0000 |
commit | 31af1467d801726d8668d3431b98dab4121a95e2 (patch) | |
tree | 5222e34d51a7e44e00dd88c20d8f5e0819aab393 /bundles | |
parent | 9a233089a83c645c819eb8a31623527885469967 (diff) | |
download | rt.equinox.p2-31af1467d801726d8668d3431b98dab4121a95e2.tar.gz rt.equinox.p2-31af1467d801726d8668d3431b98dab4121a95e2.tar.xz rt.equinox.p2-31af1467d801726d8668d3431b98dab4121a95e2.zip |
Bug 497094 - If a bundle has no symbolic name a NullPointerException canM20180207-0400
happen in ConfigApplier.refreshPackages
Change-Id: I39271ba32f2d10b71cb4a3cc24c0554c41e3173d
Signed-off-by: Thomas Watson <tjwatson@us.ibm.com>
Diffstat (limited to 'bundles')
3 files changed, 3 insertions, 3 deletions
diff --git a/bundles/org.eclipse.equinox.simpleconfigurator/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.simpleconfigurator/META-INF/MANIFEST.MF index e0ef704c1..6eb57cc04 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.2.0.qualifier +Bundle-Version: 1.2.1.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 a1a3f5ecf..3f0c1c837 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.2.0-SNAPSHOT</version> + <version>1.2.1-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 1fca13371..79c3c40a6 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,7 +397,7 @@ class ConfigApplier { Set<Bundle> allSameBSNs = new LinkedHashSet<>(); // maintain order and avoid duplicates for (Bundle bundle : bundles) { allSameBSNs.add(bundle); - String bsn = bundle.getLocation(); + String bsn = bundle.getSymbolicName(); if (bsn != null) { // look for others with same BSN Bundle[] sameBSNs = packageAdminService.getBundles(bsn, null); |