X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;f=bundles%2Forg.simantics.db.layer0%2Fsrc%2Forg%2Fsimantics%2Fdb%2Flayer0%2Futil%2FModelTransferableGraphSourceRequest.java;fp=bundles%2Forg.simantics.db.layer0%2Fsrc%2Forg%2Fsimantics%2Fdb%2Flayer0%2Futil%2FModelTransferableGraphSourceRequest.java;h=b7fe6ed7b29f4cf3c9b45358e13eb9f32544dc31;hb=da4cc0ede99247df95557b92dc173d50c341b73f;hp=5760f1a026cfa7ab2a5a054c27e6311b13cfe6e1;hpb=5887fe12f827ef474590d61c86d0de32fca8550e;p=simantics%2Fplatform.git

diff --git a/bundles/org.simantics.db.layer0/src/org/simantics/db/layer0/util/ModelTransferableGraphSourceRequest.java b/bundles/org.simantics.db.layer0/src/org/simantics/db/layer0/util/ModelTransferableGraphSourceRequest.java
index 5760f1a02..b7fe6ed7b 100644
--- a/bundles/org.simantics.db.layer0/src/org/simantics/db/layer0/util/ModelTransferableGraphSourceRequest.java
+++ b/bundles/org.simantics.db.layer0/src/org/simantics/db/layer0/util/ModelTransferableGraphSourceRequest.java
@@ -438,8 +438,12 @@ public class ModelTransferableGraphSourceRequest extends UniqueRead<ModelTransfe
 				state.externals.add(transientId);
 			} else if(ExtentStatus.PENDING == status) {
 				String uri = graph.getPossibleURI(r);
-				if(uri != null)
-					state.externals.add(transientId);
+				if(uri != null) {
+					// All internal resources with uri have been discovered already => this must then be external
+					//state.externals.add(transientId);
+					// Pending resources are found through weak links - if they are still pending at this stage do not add an external
+					processor.status.put(r, ExtentStatus.EXTERNAL);
+				}
 				else {
 					state.pending.add(transientId);
 					System.err.println("Pending status in export: " + NameUtils.getSafeName(graph, r, true) + " (" + graph.getPossibleURI(r) + ")");
@@ -447,6 +451,21 @@ public class ModelTransferableGraphSourceRequest extends UniqueRead<ModelTransfe
 			}
 		}
 
+		// Now that we know the status of the resources lets process weak statements 
+		for(Statement stm : processor.unresolvedWeakLinks) {
+			ExtentStatus status = processor.status.get(stm.getObject());
+			if(ExtentStatus.INTERNAL == status) {
+				// Weak links between internals are exported
+				int transientId = support.getTransientId(stm.getSubject());
+				processor.addToStream(stm.getPredicate(), stm.getObject());
+				try {
+					processor.flushStatementStream(transientId, state);
+				} catch (IOException e) {
+					throw new DatabaseException(e);
+				}
+			}
+		}
+
 		if (state.monitor.isCanceled())
 			throw new CancelTransactionException();