From: Marko Luukkainen <marko.luukkainen@semantum.fi>
Date: Mon, 25 Feb 2019 10:00:23 +0000 (+0000)
Subject: Merge "Added null check after getPossibleType(STR.Component)" into release/1.35.1
X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=commitdiff_plain;h=a89de05edbb55e4ae23d71eb1d0aaa7556d7148b;hp=2391d4cda4c356c2b3de3bff75b2804ef3226835;p=simantics%2Fplatform.git

Merge "Added null check after getPossibleType(STR.Component)" 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);
diff --git a/bundles/org.simantics.modeling/src/org/simantics/modeling/typicals/SyncTypicalTemplatesToInstances.java b/bundles/org.simantics.modeling/src/org/simantics/modeling/typicals/SyncTypicalTemplatesToInstances.java
index 7c1fe461a..8a0b1ddbc 100644
--- a/bundles/org.simantics.modeling/src/org/simantics/modeling/typicals/SyncTypicalTemplatesToInstances.java
+++ b/bundles/org.simantics.modeling/src/org/simantics/modeling/typicals/SyncTypicalTemplatesToInstances.java
@@ -459,6 +459,8 @@ public class SyncTypicalTemplatesToInstances extends WriteRequest {
     private boolean isSynchronizedConnector(ReadGraph graph, Resource templateConnection, Resource instanceConnector) throws DatabaseException {
     	DiagramResource DIA = DiagramResource.getInstance(graph);
     	Resource instanceConnection = graph.getPossibleObject(instanceConnector, DIA.IsConnectorOf);
+    	if (instanceConnection == null)
+    		return false;
     	return graph.hasStatement(instanceConnection, MOD.HasElementSource, templateConnection)
     			// If the master connection has been removed, this is all that's left
     			// to identify a connection that at least was originally synchronized