X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;f=org.simantics.interop.update%2Fsrc%2Forg%2Fsimantics%2Finterop%2Fupdate%2Fmodel%2FModelUpdate.java;fp=org.simantics.interop.update%2Fsrc%2Forg%2Fsimantics%2Finterop%2Fupdate%2Fmodel%2FModelUpdate.java;h=d76c47bdf655998c902de59f6f2b7f08c58f7bd8;hb=ab4fc05981803ce2c430f93f34b8b6a8f85a53ce;hp=cbdfc8f48f5cefe15c5b2ffe570b0201b269c509;hpb=7554d449f0cd1c4111b85afd75e8abd6d81f56d6;p=simantics%2Finterop.git

diff --git a/org.simantics.interop.update/src/org/simantics/interop/update/model/ModelUpdate.java b/org.simantics.interop.update/src/org/simantics/interop/update/model/ModelUpdate.java
index cbdfc8f..d76c47b 100644
--- a/org.simantics.interop.update/src/org/simantics/interop/update/model/ModelUpdate.java
+++ b/org.simantics.interop.update/src/org/simantics/interop/update/model/ModelUpdate.java
@@ -240,7 +240,11 @@ public abstract class ModelUpdate {
 			for (PropertyChange rc : r) {
 				if (comparable.containsRight(rc))
 					continue;
-				if (lc.getFirst().equals(rc.getFirst())) {
+				if (lc.getFirst() != null && lc.getFirst().equals(rc.getFirst())) {
+					comparable.map(lc, rc);
+					break;
+				}
+				if (lc.getSecond() != null && lc.getSecond().equals(rc.getSecond())) {
 					comparable.map(lc, rc);
 					break;
 				}
@@ -471,7 +475,7 @@ public abstract class ModelUpdate {
 			if (pair.getFirst() != null) {
 				boolean found = false;
 				for (PropertyChange pair2 : updateList2.getChanges()) {
-					if (pair.getFirst().equals(pair2.getSecond())) {
+					if (pair.getFirst() != null && pair.getFirst().equals(pair2.getSecond())) {
 						found = true;
 						break;
 					}