From: Tuukka Lehtonen <tuukka.lehtonen@semantum.fi>
Date: Wed, 19 Apr 2017 13:36:32 +0000 (+0300)
Subject: Fixed regression caused by cherry-pick 31000619.
X-Git-Tag: v1.28.0~22^2
X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F31%2F431%2F1;p=simantics%2Fplatform.git

Fixed regression caused by cherry-pick 31000619.

refs #7142

Change-Id: I8d15afab87f00b84ea3ecae22d1666c614418371
(cherry picked from commit 0d0f89ee7fdf9fa2315ba4d797de202992ae7158)
---

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() {