diff options
| author | Andrey Loskutov | 2020-05-05 09:24:10 +0000 |
|---|---|---|
| committer | Stephan Herrmann | 2020-05-12 16:11:27 +0000 |
| commit | 91e063ba131d7041233f08bdf4acbe4a50602366 (patch) | |
| tree | 468b958d2994371c39d8c36e33b2f5bb02089e13 | |
| parent | f9f9c212151b509b8e4a2cb93adba21fc546d492 (diff) | |
| download | eclipse.jdt.core-91e063ba131d7041233f08bdf4acbe4a50602366.tar.gz eclipse.jdt.core-91e063ba131d7041233f08bdf4acbe4a50602366.tar.xz eclipse.jdt.core-91e063ba131d7041233f08bdf4acbe4a50602366.zip | |
Bug 562770 - NPE in at JavaSearchNameEnvironment.addModuleClassPathInfo
ClasspathLocation cp can be null so we should not call
addClassPathToModule() with cp == null.
Change-Id: Icda00fdbf74d96dc24658a5c46f211f5fa773bcd
Signed-off-by: Andrey Loskutov <loskutov@gmx.de>
| -rw-r--r-- | org.eclipse.jdt.core/search/org/eclipse/jdt/internal/core/search/matching/JavaSearchNameEnvironment.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/org.eclipse.jdt.core/search/org/eclipse/jdt/internal/core/search/matching/JavaSearchNameEnvironment.java b/org.eclipse.jdt.core/search/org/eclipse/jdt/internal/core/search/matching/JavaSearchNameEnvironment.java index 751efcdd8f..30fd398e19 100644 --- a/org.eclipse.jdt.core/search/org/eclipse/jdt/internal/core/search/matching/JavaSearchNameEnvironment.java +++ b/org.eclipse.jdt.core/search/org/eclipse/jdt/internal/core/search/matching/JavaSearchNameEnvironment.java @@ -205,7 +205,7 @@ private void addModuleClassPathInfo(PackageFragmentRoot root, IModuleDescription private String addModuleClassPathInfo(ClasspathLocation cp, IModuleDescription imd) { IModule mod = NameLookup.getModuleDescriptionInfo(imd); String moduleName = null; - if (mod != null) { + if (mod != null && cp != null) { char[] name = mod.name(); if (name != null) { moduleName = new String(name); |