Bug 567113 - NPE on Configuration tab in About dialog > Installation
Details
Change-Id: Id98ba33f8ecff3f9a86176448486748e0995209a
Signed-off-by: Paul Pazderski <paul-eclipse@ppazderski.de>
diff --git a/bundles/org.eclipse.e4.core.services/META-INF/MANIFEST.MF b/bundles/org.eclipse.e4.core.services/META-INF/MANIFEST.MF
index 7b7d5c9..df26d33 100644
--- a/bundles/org.eclipse.e4.core.services/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.e4.core.services/META-INF/MANIFEST.MF
@@ -4,7 +4,7 @@
Bundle-Name: %pluginName
Bundle-Vendor: %providerName
Bundle-Localization: plugin
-Bundle-Version: 2.2.400.qualifier
+Bundle-Version: 2.2.500.qualifier
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Import-Package: javax.annotation,
diff --git a/bundles/org.eclipse.e4.core.services/pom.xml b/bundles/org.eclipse.e4.core.services/pom.xml
index 0144b48..e498be6 100644
--- a/bundles/org.eclipse.e4.core.services/pom.xml
+++ b/bundles/org.eclipse.e4.core.services/pom.xml
@@ -19,6 +19,6 @@
</parent>
<groupId>org.eclipse.e4</groupId>
<artifactId>org.eclipse.e4.core.services</artifactId>
- <version>2.2.400-SNAPSHOT</version>
+ <version>2.2.500-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/bundles/org.eclipse.e4.core.services/src/org/eclipse/e4/core/internal/services/about/InstalledBundles.java b/bundles/org.eclipse.e4.core.services/src/org/eclipse/e4/core/internal/services/about/InstalledBundles.java
index ffede0d..0547e1c 100644
--- a/bundles/org.eclipse.e4.core.services/src/org/eclipse/e4/core/internal/services/about/InstalledBundles.java
+++ b/bundles/org.eclipse.e4.core.services/src/org/eclipse/e4/core/internal/services/about/InstalledBundles.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2019 ArSysOp and others.
+ * Copyright (c) 2019, 2020 ArSysOp and others.
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License 2.0
@@ -43,7 +43,11 @@
}
private String name(Bundle bundle) {
- return bundle.getHeaders(null).get(Constants.BUNDLE_NAME);
+ String name = bundle.getHeaders(null).get(Constants.BUNDLE_NAME);
+ // Bug 567113: do not return null names because the used Collectors.toMap does
+ // not accept null values for whatever reason.
+ // And empty string is better for the used purpose anyway.
+ return name != null ? name : ""; //$NON-NLS-1$
}
private void writeBundleInfo(PrintWriter writer, Bundle bundle) {
