Fix possible NPE when handling added and removed properties

[simantics/interop.git] / org.simantics.interop.update / src / org / simantics / interop / update / model / ModelUpdate.java

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 cbdfc8f48f5cefe15c5b2ffe570b0201b269c509..d76c47bdf655998c902de59f6f2b7f08c58f7bd8 100644 (file)
--- 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;
                                        }