Fix update method using JSONObject

Author: leonardofel

pom.xml

@@ -3,7 +3,7 @@
 
     <groupId>com.github.leonardofel</groupId>
     <artifactId>json-java-put-null-fix</artifactId>
-    <version>3.0.37.unsafe</version>
+    <version>3.0.38.unsafe</version>
     <packaging>jar</packaging>
 
     <name>JSON in Java WITH WORKING .put(null)</name>

src/main/java/org/json/JSONObject.java

@@ -38,6 +38,7 @@ of this software and associated documentation files (the "Software"), to deal
 import java.lang.reflect.Modifier;
 import java.math.BigDecimal;
 import java.math.BigInteger;
+import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Enumeration;
 import java.util.HashMap;
@@ -1892,35 +1893,44 @@ public JSONObject updateOrRemove(JSONObject jo) throws JSONException {
     }
 
     private JSONObject updateOrRemove(JSONObject jo, boolean remove) throws JSONException {
-        final HashMap<String, Map.Entry<Object, Object>> entries = new HashMap<String, Map.Entry<Object, Object>>();
+        final HashMap<String, Object> oldValues = new HashMap<String, Object>();
+        final HashMap<String, Object> newValues = new HashMap<String, Object>();
+        final ArrayList<String> delValues = new ArrayList<String>();
 
-        jo.forEach((key, newValue) -> {
-            this.merge(key, newValue, (v1, v2) -> {
-                if (Objects.equals(v1, v2)) {
+        jo.forEach((key, v2) -> {
+            this.compute(key, (k, v1) -> {
+                if (Objects.equals(v1, v2) && Objects.equals(v2, v1)) {
                     return v1;
                 } else {
-                    entries.put(key, Map.entry(v1, v2));
-                    return v2;
+                    oldValues.put(key, JSONObject.NULL.equals(v1) ? null : v1);
+                    newValues.put(key, JSONObject.NULL.equals(v2) ? null : v2);
+                    return JSONObject.NULL.equals(v1) ? JSONObject.NULL : v1;
                 }
             });
         });
 
         if (remove) {
-            this.forEach((key, oldValue) -> {
+            for (String key : JSONObject.getNames(this)) {
                 if (!jo.has(key)) {
-                    this.remove(key);
-                    final Object ret = entries.put(key, Map.entry(oldValue, null));
-                    if (ret != null) {
-                        System.err.println("unexpected behavior!");
-                    }
+                    oldValues.put(key, this.remove(key));
+                    delValues.add(key);
                 }
-            });
+            }
         }
 
-        entries.forEach((key, entry) -> {
-            final Object oldValue = entry.getKey();
-            final Object newValue = entry.getValue();
-            this.propertyChangeSupport.firePropertyChange(key, oldValue, newValue);
+        oldValues.forEach((key, oldValue) -> {
+            final Object newValue;
+            if (remove && delValues.contains(key)) {
+                newValue = null;
+            } else {
+                newValue = newValues.get(key);
+            }
+
+            if (oldValue == null && newValue == null) {
+                this.propertyChangeSupport.firePropertyChange(key, JSONObject.NULL, newValue);
+            } else {
+                this.propertyChangeSupport.firePropertyChange(key, JSONObject.NULL, newValue);
+            }
         });
 
         return this;

src/test/java/org/json/junit/JSONTest.java

@@ -510,14 +510,18 @@ public void updateListener2Test() {
         jsonObject1
             .put("trueKey", Boolean.valueOf(true))
             .put("falseKey", Boolean.valueOf(false))
-            .put("stringKey", "CHANGE ME!!!");
-            //.put("nullKey", "NOT NULL");
+            .put("stringKey", "CHANGE ME!!!")
+            .put("nullKey", null)
+            .put("nullBefore", null)
+            .put("nullAfter", "null");
 
         final JSONObject oldJsonObject1 = new JSONObject(jsonObject1.toString());
 
         jsonObject2
-            .put("stringKey", "hello world!")
             .put("nullKey", null)
+            .put("nullBefore", "null")
+            .put("nullAfter", null)
+            .put("stringKey", "hello world!")
             .put("escapeStringKey", "h\be\tllo w\u1234orld!")
             .put("intKey", Long.valueOf(42));
             //.put("doubleKey", Double.valueOf(-23.45e67)); PROBLEM WITH DOUBLE CONVERTING TO BIGDECIMAL AFTER JSONOBJECT.TOSTRING
@@ -528,7 +532,9 @@ public void updateListener2Test() {
             final Object oldValue = evt.getOldValue();
             final Object newValue = evt.getNewValue();
 
-            assertNotEquals(oldValue, newValue);
+            if (!(oldValue == JSONObject.NULL && newValue == null)) {
+                assertNotEquals(oldValue, newValue);
+            }
         });
 
         jsonObject1.addUpdateListener("trueKey", evt -> {