From: Hannu Niemistö <hannu.niemisto@semantum.fi>
Date: Wed, 24 May 2017 08:55:46 +0000 (+0300)
Subject: Merge "LayerCleanupMigrationStep is too eager" into release/1.28.0
X-Git-Tag: v1.28.0~2
X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=commitdiff_plain;h=16dc98373e1623f4254d3eed2e4034271539b2ce;hp=80daffa62afed30f51a20b19989b670edbc1732c;p=simantics%2Fplatform.git

Merge "LayerCleanupMigrationStep is too eager" into release/1.28.0
---

diff --git a/bundles/org.simantics.modeling/src/org/simantics/modeling/migration/LayerCleanupMigrationStep.java b/bundles/org.simantics.modeling/src/org/simantics/modeling/migration/LayerCleanupMigrationStep.java
index 1c841bad5..c5c983944 100644
--- a/bundles/org.simantics.modeling/src/org/simantics/modeling/migration/LayerCleanupMigrationStep.java
+++ b/bundles/org.simantics.modeling/src/org/simantics/modeling/migration/LayerCleanupMigrationStep.java
@@ -77,9 +77,11 @@ public class LayerCleanupMigrationStep implements MigrationStep {
 
             	for(Resource model : graph.getObjects(indexRoot, L0.ConsistsOf)) {
             		
-            		for(Resource diagram : ModelingUtils.searchByType(graph, model, DIA.Composite)) {
-            			for(Resource layer : graph.getObjects(diagram, DIA.HasLayer))
-            				RemoverUtil.remove(graph, layer);
+            		for(Resource diagram : ModelingUtils.searchByTypeShallow(graph, model, DIA.Composite)) {
+            			for(Resource layer : graph.getObjects(diagram, DIA.HasLayer)) {
+            				if(!graph.isImmutable(layer))
+            					RemoverUtil.remove(graph, layer);
+            			}
             		}
             		
             	}