| commit | 66a1e2f5c6e6e4dd4c32c4e4562d1a9bd28d34f2 | [log] [tgz] |
|---|---|---|
| author | Andrey Loskutov <loskutov@gmx.de> | Tue Aug 03 20:51:41 2021 +0200 |
| committer | Andrey Loskutov <loskutov@gmx.de> | Tue Aug 03 17:29:16 2021 -0400 |
| tree | 6fb2d308623fe3d92baedfdb904855f2d0c0f63d | |
| parent | 91249f432c070c87710d88f65ca270e6401692cb [diff] |
Bug 575206 - NPE in NestedProjectsLabelProvider.decorateText Added guard for IPath.lastSegment() that can return null. Change-Id: I5bc5246b41c4de867389634dd6c4a9845542ff9a Signed-off-by: Andrey Loskutov <loskutov@gmx.de> Reviewed-on: https://git.eclipse.org/r/c/platform/eclipse.platform.ui/+/183662 Tested-by: Platform Bot <platform-bot@eclipse.org>
diff --git a/bundles/org.eclipse.ui.navigator.resources/META-INF/MANIFEST.MF b/bundles/org.eclipse.ui.navigator.resources/META-INF/MANIFEST.MF index f789c09..4ea0b0e 100644 --- a/bundles/org.eclipse.ui.navigator.resources/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.ui.navigator.resources/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Plugin.name Bundle-SymbolicName: org.eclipse.ui.navigator.resources; singleton:=true -Bundle-Version: 3.8.100.qualifier +Bundle-Version: 3.8.200.qualifier Bundle-Activator: org.eclipse.ui.internal.navigator.resources.plugin.WorkbenchNavigatorPlugin Bundle-Vendor: %Plugin.providerName Bundle-Localization: plugin
diff --git a/bundles/org.eclipse.ui.navigator.resources/src/org/eclipse/ui/internal/navigator/resources/nested/NestedProjectsLabelProvider.java b/bundles/org.eclipse.ui.navigator.resources/src/org/eclipse/ui/internal/navigator/resources/nested/NestedProjectsLabelProvider.java index 03c2526..c01205c 100644 --- a/bundles/org.eclipse.ui.navigator.resources/src/org/eclipse/ui/internal/navigator/resources/nested/NestedProjectsLabelProvider.java +++ b/bundles/org.eclipse.ui.navigator.resources/src/org/eclipse/ui/internal/navigator/resources/nested/NestedProjectsLabelProvider.java
@@ -110,9 +110,16 @@ } IProject project = (IProject)element; IPath location = project.getLocation(); - if (location != null && !location.lastSegment().equals(project.getName())) { + if (location == null) { + return input; + } + String lastSegment = location.lastSegment(); + if (lastSegment == null) { + return input; + } + if (!lastSegment.equals(project.getName())) { return NLS.bind(WorkbenchNavigatorMessages.NestedProjectLabelProvider_nestedProjectLabel, input, - location.lastSegment()); + lastSegment); } return input; }