Prevent NPE in CompletionResolveHandler.resolve. Fixes #629

Signed-off-by: Fred Bricon <[email protected]>
eclipse-jdtls · Apr 16, 2018 · c40a795 · c40a795
1 parent 6c64df5
commit c40a795
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/...e.jdt.ls.core/src/org/eclipse/jdt/ls/core/internal/handlers/CompletionResolveHandler.java b/...e.jdt.ls.core/src/org/eclipse/jdt/ls/core/internal/handlers/CompletionResolveHandler.java
@@ -69,7 +69,7 @@ public CompletionItem resolve(CompletionItem param, IProgressMonitor monitor) {
 		Map<String, String> data = JSONUtility.toModel(param.getData(),Map.class);
 		// clean resolve data
 		param.setData(null);
-		if (!data.containsKey(DATA_FIELD_URI) || !data.containsKey(DATA_FIELD_REQUEST_ID) || !data.containsKey(DATA_FIELD_PROPOSAL_ID)) {
+		if (data == null || !data.containsKey(DATA_FIELD_URI) || !data.containsKey(DATA_FIELD_REQUEST_ID) || !data.containsKey(DATA_FIELD_PROPOSAL_ID)) {
 			return param;
 		}
 		int proposalId = Integer.parseInt(data.get(DATA_FIELD_PROPOSAL_ID));