From d4ce6c444deed3c2a6b60e03348bb814bd56eaf3 Mon Sep 17 00:00:00 2001
From: nsingh <nsingh@pivotal.io>
Date: Tue, 24 Oct 2017 16:19:16 -0700
Subject: [PATCH] Fixed bug where conditional hover hint shows with no running
 app info

---
 .../java/conditionals/ConditionalsLiveHoverProvider.java   | 7 +++++--
 1 file changed, 5 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 8414a11b0..83a256ba8 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
@@ -121,7 +121,10 @@ public class ConditionalsLiveHoverProvider implements HoverProvider {
 					String autoConfigRecord = app.getAutoConfigReport();
 					if (autoConfigRecord != null) {
 						JSONObject autoConfigJson = new JSONObject(autoConfigRecord);
-						return Optional.of(getConditionFromPositiveMatches(annotation, autoConfigJson));
+						List<RunningAppConditional> conditionalsFromPositiveMatches = getConditionals(annotation, autoConfigJson);
+						if(!conditionalsFromPositiveMatches.isEmpty()) {
+							return Optional.of(conditionalsFromPositiveMatches);
+						}
 					}
 				}
 			} catch (Exception e) {
@@ -137,7 +140,7 @@ public class ConditionalsLiveHoverProvider implements HoverProvider {
 		 * @return non-null list of conditionals parsed from an autoconfig report. List
 		 *         may be empty.
 		 */
-		private List<RunningAppConditional> getConditionFromPositiveMatches(Annotation annotation,
+		private List<RunningAppConditional> getConditionals(Annotation annotation,
 				JSONObject autoConfigJson) {
 			List<RunningAppConditional> conditions = new ArrayList<>();