From: Marko Luukkainen <marko.luukkainen@semantum.fi>
Date: Mon, 25 Feb 2019 10:00:03 +0000 (+0000)
Subject: Merge "Added null check for getPossibleObject return value" into release/1.35.1
X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=commitdiff_plain;h=ef7d8d27dc2794217a2e87ac0e2f7715ddacf6ed;hp=8dcf73a80d3bf4e7bbbc5470f2135248a21a4fdd;p=simantics%2Fplatform.git

Merge "Added null check for getPossibleObject return value" into release/1.35.1
---

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