From b257cfc4c901e4a910830ea135812acfbbababa1 Mon Sep 17 00:00:00 2001
From: Kris De Volder <kdevolder@pivotal.io>
Date: Tue, 18 Jun 2019 10:34:55 -0700
Subject: [PATCH] Fix NPE

See: https://www.pivotaltracker.com/story/show/166760894
---
 .../ide/vscode/boot/java/utils/SymbolCacheOnDisc.java       | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/utils/SymbolCacheOnDisc.java b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/utils/SymbolCacheOnDisc.java
index 2b51fcd67..827afae1e 100644
--- a/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/utils/SymbolCacheOnDisc.java
+++ b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/utils/SymbolCacheOnDisc.java
@@ -122,8 +122,10 @@ public class SymbolCacheOnDisc implements SymbolCache {
 					List<CachedSymbol> symbols = store.getSymbols();
 					Map<String, Collection<String>> storedDependencies = store.getDependencies();
 					Multimap<String, String> dependencies = MultimapBuilder.hashKeys().hashSetValues().build();
-					for (Entry<String, Collection<String>> entry : storedDependencies.entrySet()) {
-						dependencies.replaceValues(entry.getKey(), entry.getValue());
+					if (storedDependencies!=null && !storedDependencies.isEmpty()) {
+						for (Entry<String, Collection<String>> entry : storedDependencies.entrySet()) {
+							dependencies.replaceValues(entry.getKey(), entry.getValue());
+						}
 					}
 					return Pair.of(
 							(CachedSymbol[]) symbols.toArray(new CachedSymbol[symbols.size()]),