Spring/spring-tools
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix unnecessary findType calls and NPEs in Boot LS

Browse Source
This commit is contained in:
BoykoAlex
2019-09-12 19:13:54 -04:00
parent f349518d7c
commit d8bda3812f
2 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
headless-services/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/jdtls/JdtLsIndex.java
View File

@@ -122,14 +122,15 @@ public class JdtLsIndex implements ClasspathIndex {
sourceTypeCache.put(fqName, type);
} else {
type = Optional.of(toType(data));
if (Classpath.isBinary(data.getClasspathEntry().getCpe())) {
if (data.getClasspathEntry() != null && Classpath.isBinary(data.getClasspathEntry().getCpe())) {
binaryTypeCache.put(fqName, type);
} else {
sourceTypeCache.put(fqName, type);
}
}
} catch (Exception e) {
log.error("{}", e);
log.error("Find type failed for `{}` with {}", fqName, e);
return null;
}
}
return type.orElse(null);

8
headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/metadata/types/TypeUtil.java
View File

@@ -600,9 +600,11 @@ public class TypeUtil {
public boolean isEnum(Type type) {
try {
IType eclipseType = findType(type.getErasure());
if (eclipseType!=null) {
return eclipseType.isEnum();
if (!isArray(type)) {
IType eclipseType = findType(type.getErasure());
if (eclipseType!=null) {
return eclipseType.isEnum();
}
}
} catch (Exception e) {
log.error("", e);