fix update always had global listener

Author: leonardofel

pom.xml

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

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

@@ -1845,15 +1845,14 @@ public void addUpdateListener(String key, PropertyChangeListener listener) {
      *            If updateListener not initialized.
      */
     public JSONObject update(String key, Object newValue) throws JSONException {
-        if (this.propertyChangeSupport.hasListeners(key)) {
-            final JSONObject oldThis = new JSONObject(this.toString());
-            final Object oldValue = this.opt(key);
-            this.put(key, newValue);
+        final JSONObject oldThis = new JSONObject(this.toString());
+        final Object oldValue = this.opt(key);
+        this.put(key, newValue);
 
-            this.propertyChangeSupport.firePropertyChange(JSONObject.propertyChangeGlobalKeyword, oldThis, this);
+        this.propertyChangeSupport.firePropertyChange(JSONObject.propertyChangeGlobalKeyword, oldThis, this);
+
+        if (this.propertyChangeSupport.hasListeners(key)) {
             this.propertyChangeSupport.firePropertyChange(key, oldValue, newValue);
-        } else {
-            throw new JSONException("updateListener on \"" + key + "\" not initialized");
         }
 
         return this;

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

@@ -3,7 +3,6 @@
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotEquals;
 import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertThrows;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
@@ -12,7 +11,6 @@
 import java.util.Map;
 import java.util.concurrent.atomic.AtomicInteger;
 
-import org.json.JSONException;
 import org.json.JSONObject;
 import org.junit.Test;
 
@@ -425,7 +423,7 @@ public void computeTest() {
     public void updateNotEqualsTest() {
         final JSONObject j = new JSONObject();
 
-        assertThrows(JSONException.class, () -> j.update("myMapListener", "propertyChange"));
+        //assertThrows(JSONException.class, () -> j.update("myMapListener", "propertyChange"));
 
         j.addUpdateListenerGlobal(evt -> {
             final Object oldValue = evt.getOldValue();