From f0237da6791bfbb5d37dff7fbe3ad8c4ab2d658b Mon Sep 17 00:00:00 2001 From: nsingh Date: Wed, 13 Jun 2018 16:58:21 -0700 Subject: [PATCH] Add missing null check on workbench window --- .../commons/STS4LanguageClientImpl.java | 22 ++++++++++--------- 1 file changed, 12 insertions(+), 10 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 92513b90c..9269b7be5 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 @@ -80,16 +80,18 @@ public class STS4LanguageClientImpl extends LanguageClientImpl implements STS4La IWorkbenchWindow[] windows = PlatformUI.getWorkbench().getWorkbenchWindows(); if (windows != null) { for (IWorkbenchWindow ww : windows) { - IWorkbenchPage[] pages = ww.getPages(); - if (pages != null) { - for (IWorkbenchPage page : pages) { - if (page != null) { - IEditorReference[] references = page.getEditorReferences(); - if (references != null) { - boolean restore = false; - for (IEditorReference reference : references) { - IEditorPart editorPart = reference.getEditor(restore); - updateEditorPart(editorPart); + if (ww != null) { + IWorkbenchPage[] pages = ww.getPages(); + if (pages != null) { + for (IWorkbenchPage page : pages) { + if (page != null) { + IEditorReference[] references = page.getEditorReferences(); + if (references != null) { + boolean restore = false; + for (IEditorReference reference : references) { + IEditorPart editorPart = reference.getEditor(restore); + updateEditorPart(editorPart); + } } } }