From: Marko Luukkainen <marko.luukkainen@semantum.fi>
Date: Fri, 25 Aug 2023 12:40:03 +0000 (+0300)
Subject: Graph comparison and change management fixes.
X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F57%2F4957%2F1;p=simantics%2Finterop.git

Graph comparison and change management fixes.

GraphChanges did not take account that property relations may not be
included in the bijection.

Change-Id: If770c692c35f5104c34c947bbbc4953378d152e1
---

diff --git a/org.simantics.interop/src/org/simantics/interop/test/GraphChanges.java b/org.simantics.interop/src/org/simantics/interop/test/GraphChanges.java
index f906507..304c156 100644
--- a/org.simantics.interop/src/org/simantics/interop/test/GraphChanges.java
+++ b/org.simantics.interop/src/org/simantics/interop/test/GraphChanges.java
@@ -271,6 +271,8 @@ public class GraphChanges {
 						p2 = p1;
 					Resource o1 = del.getObject();
 					Resource o2 = bijection.getComparable().getRight(o1);
+					if (o2 == null)
+						o2 = graph.getPossibleObject(s2, p2);
 					
 					if (s2 == null || p2 == null || o2 == null) {
 						throw new DatabaseException("Did not find matching statement from bijection for (" + s1 +","+p1+","+o1+"), got (" + s2 +","+p2+","+o2+")");