aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFred Bricon2018-07-31 15:12:05 -0400
committerFred Bricon2018-07-31 15:12:05 -0400
commitbc5a41b231e7a5d9c55cb80d570826d3de573995 (patch)
tree4a5f8cb289adf74644f344429874bcf7468a7f88
parent1a9813ac6e50b78b731e2e4857a71e8434b82a98 (diff)
downloadm2e-core-bc5a41b231e7a5d9c55cb80d570826d3de573995.tar.gz
m2e-core-bc5a41b231e7a5d9c55cb80d570826d3de573995.tar.xz
m2e-core-bc5a41b231e7a5d9c55cb80d570826d3de573995.zip
536056 : prevent NPE in MavenClassifierManager.getClassifierClasspathProvider
Change-Id: I08e4550390991638cb44c166e0f957870baee074 Signed-off-by: Fred Bricon <fbricon@gmail.com>
-rw-r--r--org.eclipse.m2e.jdt/src/org/eclipse/m2e/jdt/internal/MavenClassifierManager.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/org.eclipse.m2e.jdt/src/org/eclipse/m2e/jdt/internal/MavenClassifierManager.java b/org.eclipse.m2e.jdt/src/org/eclipse/m2e/jdt/internal/MavenClassifierManager.java
index dbb4fecd..3053ad7a 100644
--- a/org.eclipse.m2e.jdt/src/org/eclipse/m2e/jdt/internal/MavenClassifierManager.java
+++ b/org.eclipse.m2e.jdt/src/org/eclipse/m2e/jdt/internal/MavenClassifierManager.java
@@ -128,7 +128,7 @@ public class MavenClassifierManager implements IMavenClassifierManager {
if(resolvedPath != null) {
IWorkspaceRoot root = ResourcesPlugin.getWorkspace().getRoot();
IResource res = root.findMember(resolvedPath);
- if(res.getProject().equals(project.getProject())) {
+ if(res != null && res.getProject().equals(project.getProject())) {
IPath projectRelativePath = res.getProjectRelativePath();
return new WorkspaceClassifierResolverDelegatingProvider(projectRelativePath);
}