Fix updateOrRemove with both this and jo empty

Author: leonardofel

pom.xml

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

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

@@ -1910,10 +1910,13 @@ private JSONObject updateOrRemove(JSONObject jo, boolean remove) throws JSONExce
         });
 
         if (remove) {
-            for (String key : JSONObject.getNames(this)) {
-                if (!jo.has(key)) {
-                    oldValues.put(key, this.remove(key));
-                    delValues.add(key);
+            final String[] names = JSONObject.getNames(this);
+            if (names != null) {
+                for (String key : names) {
+                    if (!jo.has(key)) {
+                        oldValues.put(key, this.remove(key));
+                        delValues.add(key);
+                    }
                 }
             }
         }

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

@@ -526,6 +526,8 @@ public void updateListener2Test() {
             .put("intKey", Long.valueOf(42));
             //.put("doubleKey", Double.valueOf(-23.45e67)); PROBLEM WITH DOUBLE CONVERTING TO BIGDECIMAL AFTER JSONOBJECT.TOSTRING
 
+        final JSONObject jsonObject3 = new JSONObject(jsonObject2.toString());
+
         final JSONObject oldJsonObject2 = new JSONObject(jsonObject2.toString());
 
         jsonObject1.addUpdateListenerGlobal(evt -> {
@@ -565,8 +567,83 @@ public void updateListener2Test() {
         assertEquals(jsonObject2.toString(), oldJsonObject2.toString());
 
         jsonObject1.update(jsonObject2);
+        jsonObject3.updateOrRemove(jsonObject2);
 
         assertNotEquals(jsonObject1.toString(), oldJsonObject1.toString());
         assertEquals(jsonObject2.toString(), oldJsonObject2.toString());
     }
+
+    @Test
+    public void updateOrRemoveSrcEmptyTest() {
+        try {
+            final JSONObject jsonObject1 = new JSONObject();
+            final JSONObject jsonObject2 = new JSONObject()
+                .put("trueKey", Boolean.valueOf(true))
+                .put("falseKey", Boolean.valueOf(false))
+                .put("stringKey", "hello world!")
+                .put("nullKey", null);
+
+            jsonObject1.addUpdateListenerGlobal(evt -> {
+                final Object oldValue = evt.getOldValue();
+                final Object newValue = evt.getNewValue();
+
+                if (!(oldValue == JSONObject.NULL && newValue == null)) {
+                    assertNotEquals(oldValue, newValue);
+                }
+            });
+
+            jsonObject1.updateOrRemove(jsonObject2);
+        } catch (Exception ex) {
+            ex.printStackTrace();
+            fail(ex.getMessage());
+        }
+    }
+
+    @Test
+    public void updateOrRemoveDstEmptyTest() {
+        try {
+            final JSONObject jsonObject1 = new JSONObject()
+                .put("trueKey", Boolean.valueOf(true))
+                .put("falseKey", Boolean.valueOf(false))
+                .put("stringKey", "hello world!")
+                .put("nullKey", null);
+            final JSONObject jsonObject2 = new JSONObject();
+
+            jsonObject1.addUpdateListenerGlobal(evt -> {
+                final Object oldValue = evt.getOldValue();
+                final Object newValue = evt.getNewValue();
+
+                if (!(oldValue == JSONObject.NULL && newValue == null)) {
+                    assertNotEquals(oldValue, newValue);
+                }
+            });
+
+            jsonObject1.updateOrRemove(jsonObject2);
+        } catch (Exception ex) {
+            ex.printStackTrace();
+            fail(ex.getMessage());
+        }
+    }
+
+    @Test
+    public void updateOrRemoveAlltEmptyTest() {
+        try {
+            final JSONObject jsonObject1 = new JSONObject();
+            final JSONObject jsonObject2 = new JSONObject();
+
+            jsonObject1.addUpdateListenerGlobal(evt -> {
+                final Object oldValue = evt.getOldValue();
+                final Object newValue = evt.getNewValue();
+
+                if (!(oldValue == JSONObject.NULL && newValue == null)) {
+                    assertNotEquals(oldValue, newValue);
+                }
+            });
+
+            jsonObject1.updateOrRemove(jsonObject2);
+        } catch (Exception ex) {
+            ex.printStackTrace();
+            fail(ex.getMessage());
+        }
+    }
 }