From 99d62d0ae0488e11e3ed4d262bff904933c3bb6b Mon Sep 17 00:00:00 2001 From: BoykoAlex Date: Thu, 13 Jun 2019 15:06:19 -0400 Subject: [PATCH] Ensure javadoc is not null before setting the markup value --- .../tooling/ls/eclipse/commons/STS4LanguageClientImpl.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/eclipse-language-servers/org.springframework.tooling.ls.eclipse.commons/src/org/springframework/tooling/ls/eclipse/commons/STS4LanguageClientImpl.java b/eclipse-language-servers/org.springframework.tooling.ls.eclipse.commons/src/org/springframework/tooling/ls/eclipse/commons/STS4LanguageClientImpl.java index b39976e8b..ecec52c13 100644 --- a/eclipse-language-servers/org.springframework.tooling.ls.eclipse.commons/src/org/springframework/tooling/ls/eclipse/commons/STS4LanguageClientImpl.java +++ b/eclipse-language-servers/org.springframework.tooling.ls.eclipse.commons/src/org/springframework/tooling/ls/eclipse/commons/STS4LanguageClientImpl.java @@ -374,8 +374,11 @@ public class STS4LanguageClientImpl extends LanguageClientImpl implements STS4La try { MarkupContent mc = new MarkupContent(); mc.setKind(MarkupKind.MARKDOWN); - mc.setValue(JavadocUtils.javadoc(JavaDoc2MarkdownConverter::getMarkdownContentReader, - URI.create(params.getProjectUri()), params.getBindingKey(), JavaDataParams.isLookInOtherProjects(params))); + String javadoc = JavadocUtils.javadoc(JavaDoc2MarkdownConverter::getMarkdownContentReader, + URI.create(params.getProjectUri()), params.getBindingKey(), JavaDataParams.isLookInOtherProjects(params)); + if (javadoc != null) { + mc.setValue(javadoc); + } return mc; } catch (Exception e) { LanguageServerCommonsActivator.logError(e, "Failed getting javadoc for " + params.toString());