From 8d7920a646196cf2b56edc0fe7ef98ef6343a9da Mon Sep 17 00:00:00 2001
From: Simon Barner <barner@fortiss.org>
Date: Mon, 22 Mar 2021 11:33:11 +0100
Subject: [PATCH] Add null-check for IModelEditorBindingService::getEditor()
Issue-Ref: 4122
Issue-Url: https://git.fortiss.org/af3/af3/-/issues/4122
Signed-off-by: Simon Barner <barner@fortiss.org>
---
.../src/org/fortiss/tooling/kernel/ui/util/.ratings | 2 +-
.../src/org/fortiss/tooling/kernel/ui/util/KernelUIUtils.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/org.fortiss.tooling.kernel.ui/src/org/fortiss/tooling/kernel/ui/util/.ratings b/org.fortiss.tooling.kernel.ui/src/org/fortiss/tooling/kernel/ui/util/.ratings
index 049538585..18f50674e 100644
--- a/org.fortiss.tooling.kernel.ui/src/org/fortiss/tooling/kernel/ui/util/.ratings
+++ b/org.fortiss.tooling.kernel.ui/src/org/fortiss/tooling/kernel/ui/util/.ratings
@@ -4,7 +4,7 @@ DataBindingUtils.java 631c47881caa13fc567679a7e4416eb777af0713 GREEN
DragAndDropUtils.java 7aab91518aa12d76533a345bf6ed0be9ac7ff0e5 GREEN
EObjectSelectionUtils.java 128cf8f96c6b9478171dff3deda662d5934f5f44 GREEN
HierarchicalNameViewerComparator.java 199d82e392d4e437810cc65c0fc521dab52038e0 GREEN
-KernelUIUtils.java 46d3279ef3523b104f89a6c526109f72d36f72f2 GREEN
+KernelUIUtils.java dd58b2c618b7c847aa8cfa2d3bd9956b40b73cdd GREEN
MessageUtilsExtended.java a08055b2f0005eebfa91662374d9ec4ce4f78aab GREEN
ObservableUtils.java 34abfd1dfaf9c0acbb31caf1f525e7b39416c116 GREEN
PropertiesConstantUtils.java 59b1a1e4d594bb98db3aa396f2ff6474ba405920 GREEN
diff --git a/org.fortiss.tooling.kernel.ui/src/org/fortiss/tooling/kernel/ui/util/KernelUIUtils.java b/org.fortiss.tooling.kernel.ui/src/org/fortiss/tooling/kernel/ui/util/KernelUIUtils.java
index 46d3279ef..dd58b2c61 100644
--- a/org.fortiss.tooling.kernel.ui/src/org/fortiss/tooling/kernel/ui/util/KernelUIUtils.java
+++ b/org.fortiss.tooling.kernel.ui/src/org/fortiss/tooling/kernel/ui/util/KernelUIUtils.java
@@ -48,7 +48,7 @@ public class KernelUIUtils {
if(editorClazz.isInstance(editor)) {
return (E)editor;
}
- if(editor.getSite() instanceof MultiPageEditorSite) {
+ if(editor != null && editor.getSite() instanceof MultiPageEditorSite) {
MultiPageEditorSite multiEditor = (MultiPageEditorSite)editor.getSite();
ExtendableMultiPageEditor multiPage =
(ExtendableMultiPageEditor)multiEditor.getMultiPageEditor();
--
GitLab