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=1ec61cfaa5d6806ff5efc924cd0c9eb9174f9f7b;p=simantics%2Fplatform.git

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

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