diff options
| author | Karsten Thoms | 2017-08-07 09:05:43 +0000 |
|---|---|---|
| committer | Karsten Thoms | 2017-09-04 11:37:38 +0000 |
| commit | ca148024b8db19631e75d7aa6792437b8725a3ac (patch) | |
| tree | d6255c20c9469a9754b8175f07dd5e2452744f2a | |
| parent | 15d0d12802084f3141bfdff8fe9136d1e3d691bb (diff) | |
| download | eclipse.platform.text-I20170904-2000.tar.gz eclipse.platform.text-I20170904-2000.tar.xz eclipse.platform.text-I20170904-2000.zip | |
Bug 480563 - Add null guard when site was not setI20170906-0225I20170905-2000I20170905-0600I20170905-0310I20170904-2000
Change-Id: Ic8ffc3d7f3a6ed1b62c2a74db8b5fa7973130db8
Signed-off-by: Karsten Thoms <karsten.thoms@itemis.de>
| -rw-r--r-- | org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/AbstractTextEditor.java | 7 |
1 files changed, 6 insertions, 1 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 f6b0dd2f1e2..3b72ef096eb 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 @@ -193,6 +193,7 @@ import org.eclipse.ui.IWindowListener; import org.eclipse.ui.IWorkbenchActionConstants; import org.eclipse.ui.IWorkbenchCommandConstants; import org.eclipse.ui.IWorkbenchPart; +import org.eclipse.ui.IWorkbenchPartSite; import org.eclipse.ui.IWorkbenchWindow; import org.eclipse.ui.PartInitException; import org.eclipse.ui.PlatformUI; @@ -5327,7 +5328,11 @@ public abstract class AbstractTextEditor extends EditorPart implements ITextEdit for (int i= 0; i < elements.length; i++) { IConfigurationElement element= elements[i]; if (TAG_CONTRIBUTION_TYPE.equals(element.getName())) { - if (!getSite().getId().equals(element.getAttribute("targetID"))) //$NON-NLS-1$ + IWorkbenchPartSite site = getSite(); + if (site == null) { + return null; + } + if (!site.getId().equals(element.getAttribute("targetID"))) //$NON-NLS-1$ continue; IConfigurationElement[] children= element.getChildren("action"); //$NON-NLS-1$ |