Bug 526139 - NullPointerException in ToggleBreakpointAction.getDocument
Change-Id: I95bec4d9f62613f25a94c2c3ea3e86df07918e6a
Signed-off-by: Andrey Loskutov <loskutov@gmx.de>
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/actions/ToggleBreakpointAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/actions/ToggleBreakpointAction.java
index 247eb9b..0078ad3 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/actions/ToggleBreakpointAction.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/actions/ToggleBreakpointAction.java
@@ -168,14 +168,20 @@
* @return the document or <code>null</code> if none
*/
private IDocument getDocument() {
- if (fDocument != null)
+ if (fDocument != null) {
return fDocument;
+ }
+
+ if (fPart == null) {
+ return null;
+ }
if (fPart instanceof ITextEditor) {
ITextEditor editor= (ITextEditor)fPart;
IDocumentProvider provider = editor.getDocumentProvider();
- if (provider != null)
+ if (provider != null) {
return provider.getDocument(editor.getEditorInput());
+ }
}
IDocument doc = fPart.getAdapter(IDocument.class);
@@ -186,9 +192,6 @@
return null;
}
- /* (non-Javadoc)
- * @see org.eclipse.ui.texteditor.IUpdate#update()
- */
@Override
public void update() {
IDocument document= getDocument();