From: Tuukka Lehtonen <tuukka.lehtonen@semantum.fi>
Date: Thu, 20 Sep 2018 12:45:46 +0000 (+0300)
Subject: Fixed NPE from ConnectionPointNameStyle.applyStyleForNode
X-Git-Url: https://gerrit.simantics.org/r/gitweb?p=simantics%2Fplatform.git;a=commitdiff_plain;h=1ec61cfaa5d6806ff5efc924cd0c9eb9174f9f7b

Fixed NPE from ConnectionPointNameStyle.applyStyleForNode

gitlab #129

Change-Id: I7d5f3be3cc695e5a6e8f9cf131fcc24b275a5e85
(cherry picked from commit df479ad3f602a36c39374d95c0e205b27c868f94)
(cherry picked from commit 7bef46ce0a0897830a07b0e3f7a482c2c2f48acb)
---

diff --git a/bundles/org.simantics.modeling.ui/src/org/simantics/modeling/ui/diagram/style/ConnectionPointNameStyle.java b/bundles/org.simantics.modeling.ui/src/org/simantics/modeling/ui/diagram/style/ConnectionPointNameStyle.java
index a4f32e811..d86925e48 100644
--- a/bundles/org.simantics.modeling.ui/src/org/simantics/modeling/ui/diagram/style/ConnectionPointNameStyle.java
+++ b/bundles/org.simantics.modeling.ui/src/org/simantics/modeling/ui/diagram/style/ConnectionPointNameStyle.java
@@ -159,8 +159,8 @@ public class ConnectionPointNameStyle extends StyleBase<List<ConnectionPointName
         // always clean up old items before drawing new items
         cleanupStyleForNode(_node);
 
-        int count = resultList.size();
-        if (resultList == null || count < 2)
+        int count = resultList != null ? resultList.size() : 0;
+        if (count < 2)
             return;
 
         G2DParentNode parentNode = ProfileVariables.claimChild(_node, "", PARENT_NODE_NAME_PREFIX, G2DParentNode.class, observer);