From: Tuukka Lehtonen <tuukka.lehtonen@semantum.fi>
Date: Thu, 20 Sep 2018 15:01:26 +0000 (+0000)
Subject: Merge "New parametrisation of OpenDiagramFromConfigurationAdapter.openEditor"
X-Git-Tag: v1.43.0~136^2~365
X-Git-Url: https://gerrit.simantics.org/r/gitweb?p=simantics%2Fplatform.git;a=commitdiff_plain;h=6d789e04560b01a1845d39f7e951230bb74d6470;hp=08f4d03f521f01e2482c9dda8b314571ea8c35c3

Merge "New parametrisation of OpenDiagramFromConfigurationAdapter.openEditor"
---

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);