From bcc339b22397ddf71e8510bd0e439e65f34c493a Mon Sep 17 00:00:00 2001
From: Simon Barner <barner@fortiss.org>
Date: Tue, 20 Nov 2018 17:31:53 +0100
Subject: [PATCH] Avoid NPE when refresh()ing before the EMFDataBindingContext
is set
Issue-Ref: 3470
Issue-Url: https://af3-developer.fortiss.org/issues/3470
Signed-off-by: Simon Barner <barner@fortiss.org>
---
.../org/fortiss/tooling/kernel/ui/extension/base/.ratings | 2 +-
.../kernel/ui/extension/base/PropertySectionBase.java | 6 ++++--
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/org.fortiss.tooling.kernel.ui/src/org/fortiss/tooling/kernel/ui/extension/base/.ratings b/org.fortiss.tooling.kernel.ui/src/org/fortiss/tooling/kernel/ui/extension/base/.ratings
index d89b93130..574ffdd72 100644
--- a/org.fortiss.tooling.kernel.ui/src/org/fortiss/tooling/kernel/ui/extension/base/.ratings
+++ b/org.fortiss.tooling.kernel.ui/src/org/fortiss/tooling/kernel/ui/extension/base/.ratings
@@ -10,7 +10,7 @@ ModelEditorBindingBase.java 4c5ac569c0b6e7678fc8191096b26dfd09fdcb98 GREEN
ModelElementHandlerBase.java 384727748f125c9d43f19d9c0eba4ba1be5a7a26 GREEN
MultiEObjectActionBase.java 9e237d8ea640c4194e4877af4a9cfce88698e543 GREEN
NamedCommentedModelElementHandlerBase.java 681b98b50b362f01abb7a36f108f4f11b9e51829 GREEN
-PropertySectionBase.java 3601ee8bd77be45ff770a5ee1c7536f100bee6b2 GREEN
+PropertySectionBase.java 8a0c90a7657fb93695d50f570ff8043cf7bb8602 YELLOW
TutorialStepUIAtomicBase.java cea2a158158b476de2108d2309afcf47f217b6d9 GREEN
TutorialStepUIAtomicWithWhitelistBase.java a9788ae514f62d27169c737ef59fb583234b5d43 GREEN
TutorialStepUICompositeBase.java 8225210eacb5b88de47d78280c5819f572f00ffa GREEN
diff --git a/org.fortiss.tooling.kernel.ui/src/org/fortiss/tooling/kernel/ui/extension/base/PropertySectionBase.java b/org.fortiss.tooling.kernel.ui/src/org/fortiss/tooling/kernel/ui/extension/base/PropertySectionBase.java
index 3601ee8bd..8a0c90a76 100644
--- a/org.fortiss.tooling.kernel.ui/src/org/fortiss/tooling/kernel/ui/extension/base/PropertySectionBase.java
+++ b/org.fortiss.tooling.kernel.ui/src/org/fortiss/tooling/kernel/ui/extension/base/PropertySectionBase.java
@@ -282,8 +282,10 @@ public abstract class PropertySectionBase extends AbstractPropertySection {
*/
@Override
public void refresh() {
- dbc.dispose();
- dbc = new EMFDataBindingContext();
+ if(dbc != null) {
+ dbc.dispose();
+ dbc = new EMFDataBindingContext();
+ }
}
/**
--
GitLab