From 4e5ae58f48a2f992ae1e8a73fd19a69c3d6a67a2 Mon Sep 17 00:00:00 2001 From: Kris De Volder Date: Tue, 24 Oct 2017 10:36:29 -0700 Subject: [PATCH] Fix an NPE --- .../RequestMappingHoverProvider.java | 21 ++++++++++--------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/headless-services/boot-java-language-server/src/main/java/org/springframework/ide/vscode/boot/java/requestmapping/RequestMappingHoverProvider.java b/headless-services/boot-java-language-server/src/main/java/org/springframework/ide/vscode/boot/java/requestmapping/RequestMappingHoverProvider.java index 24268ae3a..b09eb0ef2 100644 --- a/headless-services/boot-java-language-server/src/main/java/org/springframework/ide/vscode/boot/java/requestmapping/RequestMappingHoverProvider.java +++ b/headless-services/boot-java-language-server/src/main/java/org/springframework/ide/vscode/boot/java/requestmapping/RequestMappingHoverProvider.java @@ -100,16 +100,17 @@ public class RequestMappingHoverProvider implements HoverProvider { try { for (SpringBootApp app : runningApps) { String mappings = app.getRequestMappings(); - JSONObject requestMappings = new JSONObject(mappings); - - String rawPath = getRawPath(annotation, requestMappings); - if (rawPath != null) { - String path = UrlUtil.extractPath(rawPath); - if (path != null) { - String rawMethod = getRawMethod(annotation, requestMappings); - JLRMethod parsedMethod = JLRMethodParser.parse(rawMethod); - if (methodMatchesAnnotation(annotation, parsedMethod)) { - return Optional.of(new RequestMappingMethod(path, parsedMethod, app)); + if (mappings!=null) { + JSONObject requestMappings = new JSONObject(mappings); + String rawPath = getRawPath(annotation, requestMappings); + if (rawPath != null) { + String path = UrlUtil.extractPath(rawPath); + if (path != null) { + String rawMethod = getRawMethod(annotation, requestMappings); + JLRMethod parsedMethod = JLRMethodParser.parse(rawMethod); + if (methodMatchesAnnotation(annotation, parsedMethod)) { + return Optional.of(new RequestMappingMethod(path, parsedMethod, app)); + } } } }