From: Hannu Niemistö <hannu.niemisto@semantum.fi>
Date: Tue, 18 Apr 2017 14:03:01 +0000 (+0300)
Subject: Merge "Model export broke down due to internal resource changes"
X-Git-Tag: v1.29.0~107
X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=commitdiff_plain;h=b3f5c0f18c4bd4f7014c029985aa53ff8c6a5372;hp=e6c0bd9436ccc79e7dca17809dfa28f46967257a;p=simantics%2Fplatform.git

Merge "Model export broke down due to internal resource changes"
---

diff --git a/bundles/org.simantics.db.layer0/src/org/simantics/db/layer0/util/ModelTransferableGraphSource.java b/bundles/org.simantics.db.layer0/src/org/simantics/db/layer0/util/ModelTransferableGraphSource.java
index e7fa24124..2d0fbcfe1 100644
--- a/bundles/org.simantics.db.layer0/src/org/simantics/db/layer0/util/ModelTransferableGraphSource.java
+++ b/bundles/org.simantics.db.layer0/src/org/simantics/db/layer0/util/ModelTransferableGraphSource.java
@@ -228,7 +228,7 @@ public class ModelTransferableGraphSource implements TransferableGraphSource {
 	
 	@Override
 	public int getIdentityCount() {
-		return configuration.roots.size() + state.externals.size() + 1;
+		return configuration.roots.size() + state.externals.size() + state.internalEntries.size() + 1;
 	}
 	
 	@Override
@@ -415,6 +415,8 @@ public class ModelTransferableGraphSource implements TransferableGraphSource {
 			for(InternalEntry ie : state.internalEntries) {
 				if(ie.parent != null && ie.name != null) {
 					procedure.execute(resolveInternal(graph, support, ie, internalMap));
+				} else {
+					throw new DatabaseException("Invalid internal entry " + ie);
 				}
 			}
 		}