From: Tuukka Lehtonen <tuukka.lehtonen@semantum.fi>
Date: Wed, 14 Sep 2016 11:31:12 +0000 (+0300)
Subject: Sync git svn branch with SVN repository r33191.
X-Git-Tag: v1.25.0~119^2
X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=commitdiff_plain;h=606a8f7;p=simantics%2Fplatform.git

Sync git svn branch with SVN repository r33191.

refs #6685
---

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 435d64473..56d61c868 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
@@ -437,7 +437,11 @@ 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);
-    	return graph.hasStatement(instanceConnection, MOD.HasElementSource, templateConnection);
+    	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
+    			// from the typical master to this instance.
+    			|| graph.hasStatement(instanceConnection, MOD.IsTemplatized);
     }
 
     /**