From d3bd5d701149c2e6915581a15845c6d20f55acbd Mon Sep 17 00:00:00 2001
From: nsingh <nsingh@pivotal.io>
Date: Sun, 22 Oct 2017 21:30:56 -0700
Subject: [PATCH] Fixed NPE in fetching autoconfig report

The report may not yet be available in the SpringBootApp and results in
NPE.
---
 .../java/conditionals/ConditionalsLiveHoverProvider.java    | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/headless-services/boot-java-language-server/src/main/java/org/springframework/ide/vscode/boot/java/conditionals/ConditionalsLiveHoverProvider.java b/headless-services/boot-java-language-server/src/main/java/org/springframework/ide/vscode/boot/java/conditionals/ConditionalsLiveHoverProvider.java
index 021e210f9..3bc0d59c6 100644
--- a/headless-services/boot-java-language-server/src/main/java/org/springframework/ide/vscode/boot/java/conditionals/ConditionalsLiveHoverProvider.java
+++ b/headless-services/boot-java-language-server/src/main/java/org/springframework/ide/vscode/boot/java/conditionals/ConditionalsLiveHoverProvider.java
@@ -116,8 +116,10 @@ public class ConditionalsLiveHoverProvider implements HoverProvider {
 			try {
 				for (SpringBootApp app : runningApps) {
 					String autoConfigRecord = app.getAutoConfigReport();
-					JSONObject autoConfigJson = new JSONObject(autoConfigRecord);
-					return Optional.of(getConditionFromPositiveMatches(annotation, autoConfigJson));
+					if (autoConfigRecord != null) {
+						JSONObject autoConfigJson = new JSONObject(autoConfigRecord);
+						return Optional.of(getConditionFromPositiveMatches(annotation, autoConfigJson));
+					}
 				}
 			} catch (Exception e) {
 				Log.log(e);