Bug 519426 - AbstractTextEditor should check result of getDocument() toI20170713-0615I20170712-2000I20170711-2000

avoid NPEs

Change-Id: I356451fefac791eec7d52f0c7d020f3d9168c8a8
Signed-off-by: Andrey Loskutov <loskutov@gmx.de>

1 files changed, 13 insertions, 6 deletions

diff --git a/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/AbstractTextEditor.java b/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/AbstractTextEditor.java
index 64c72acccdd..f6b0dd2f1e2 100644
--- a/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/AbstractTextEditor.java
+++ b/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/AbstractTextEditor.java
@@ -619,17 +619,21 @@ public abstract class AbstractTextEditor extends EditorPart implements ITextEdit
 						IDocument document= getDocumentProvider().getDocument(input);
 
 						if (fLocalLastEditPosition != null) {
-							document.removePosition(fLocalLastEditPosition);
+							if (document != null) {
+								document.removePosition(fLocalLastEditPosition);
+							}
 							fLocalLastEditPosition= null;
 						}
 
 						if (sel instanceof ITextSelection && !sel.isEmpty()) {
 							ITextSelection s= (ITextSelection) sel;
 							fLocalLastEditPosition= new Position(s.getOffset(), s.getLength());
-							try {
-								document.addPosition(fLocalLastEditPosition);
-							} catch (BadLocationException ex) {
-								fLocalLastEditPosition= null;
+							if (document != null) {
+								try {
+									document.addPosition(fLocalLastEditPosition);
+								} catch (BadLocationException ex) {
+									fLocalLastEditPosition = null;
+								}
 							}
 						}
 
@@ -6911,7 +6915,10 @@ public abstract class AbstractTextEditor extends EditorPart implements ITextEdit
 		boolean currentAnnotation= false;
 
 		IDocument document= getDocumentProvider().getDocument(getEditorInput());
-		int endOfDocument= document.getLength();
+		int endOfDocument = 0;
+		if (document != null) {
+			endOfDocument = document.getLength();
+		}
 		int distance= Integer.MAX_VALUE;
 
 		IAnnotationModel model= getDocumentProvider().getAnnotationModel(getEditorInput());