From: Tuukka Lehtonen <tuukka.lehtonen@semantum.fi>
Date: Wed, 19 Apr 2017 14:29:36 +0000 (+0300)
Subject: Merge "Fixed regression caused by cherry-pick 31000619." into release/1.28.0
X-Git-Tag: v1.28.0~22
X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=commitdiff_plain;h=b0298def70f7b737fa79994ad7f4f098d28becfe;hp=409fef61ef75aa9c449630f99bb6881c80f9d7f5;p=simantics%2Fplatform.git

Merge "Fixed regression caused by cherry-pick 31000619." into release/1.28.0
---

diff --git a/bundles/org.simantics.modeling.ui/src/org/simantics/modeling/ui/componentTypeEditor/ComponentTypeViewerData.java b/bundles/org.simantics.modeling.ui/src/org/simantics/modeling/ui/componentTypeEditor/ComponentTypeViewerData.java
index 7fd6340cf..d6b312426 100644
--- a/bundles/org.simantics.modeling.ui/src/org/simantics/modeling/ui/componentTypeEditor/ComponentTypeViewerData.java
+++ b/bundles/org.simantics.modeling.ui/src/org/simantics/modeling/ui/componentTypeEditor/ComponentTypeViewerData.java
@@ -309,9 +309,11 @@ public class ComponentTypeViewerData {
                 }
                 text.dispose();
 
-                String error = validator.apply(Simantics.getSession(), componentType, propertyInfo.resource, newValue);
-                if (error != null)
-                    return;
+                if (validator != null) {
+                    String error = validator.apply(Simantics.getSession(), componentType, propertyInfo.resource, newValue);
+                    if (error != null)
+                        return;
+                }
 
                 if (writer != null) {
                     Simantics.getSession().async(new WriteRequest() {