| commit | 31a77de61932101b1debda69715231827a051ef8 | [log] [tgz] |
|---|---|---|
| author | Eugen Neufeld <eneufeld@eclipsesource.com> | Wed Jul 22 17:26:41 2020 +0200 |
| committer | Eugen Neufeld <eneufeld@eclipsesource.com> | Wed Jul 22 17:26:41 2020 +0200 |
| tree | 567115fd1adcfea55cfbaffae534ed0f40cd0249 | |
| parent | f7f9f0abceaa7143ed69a36cbc4e100aab90dea7 [diff] |
TCI - Fix NPE - Possible NPE in GenericEditor - Possible NPE in ViewEditorPart Change-Id: Ifaebb1a80f81aee78303f655c5420421d2b164fa Signed-off-by: Eugen Neufeld <eneufeld@eclipsesource.com>
diff --git a/bundles/org.eclipse.emf.ecp.ide.editor.view/src/org/eclipse/emf/ecp/ide/editor/view/ViewEditorPart.java b/bundles/org.eclipse.emf.ecp.ide.editor.view/src/org/eclipse/emf/ecp/ide/editor/view/ViewEditorPart.java index de4e9af..9b4e2ba 100644 --- a/bundles/org.eclipse.emf.ecp.ide.editor.view/src/org/eclipse/emf/ecp/ide/editor/view/ViewEditorPart.java +++ b/bundles/org.eclipse.emf.ecp.ide.editor.view/src/org/eclipse/emf/ecp/ide/editor/view/ViewEditorPart.java
@@ -1038,7 +1038,9 @@ Display.getDefault().asyncExec(new Runnable() { @Override public void run() { - page.closeEditor(instance, false); + if (page != null) { + page.closeEditor(instance, false); + } } }); return false;
diff --git a/bundles/org.eclipse.emfforms.editor/src/org/eclipse/emfforms/spi/editor/GenericEditor.java b/bundles/org.eclipse.emfforms.editor/src/org/eclipse/emfforms/spi/editor/GenericEditor.java index bb1fe67..380b207 100644 --- a/bundles/org.eclipse.emfforms.editor/src/org/eclipse/emfforms/spi/editor/GenericEditor.java +++ b/bundles/org.eclipse.emfforms.editor/src/org/eclipse/emfforms/spi/editor/GenericEditor.java
@@ -354,7 +354,7 @@ if (getDiagnosticCache() == null || reloading) { return; } - if (markerJob.get() != null) { + if (markerJob != null && markerJob.get() != null) { markerJob.get().cancel(); markerJob.compareAndSet(markerJob.get(), null); }