Revert "Threads for onUpdate and onNotify"

This reverts commit 42b661a.

Author: leonardofel

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

@@ -1854,20 +1854,16 @@ public JSONObject update(String key, Object newValue) throws JSONException {
         final Object oldValue = this.opt(key);
         this.put(key, newValue);
 
+        this.propertyChangeSupportUpdate.firePropertyChange(JSONObject.propertyChangeGlobalKeyword, oldThis, this);
+        this.propertyChangeSupportUpdate.firePropertyChange(key, oldValue, newValue);
 
-        new Thread(() -> {
-            this.propertyChangeSupportUpdate.firePropertyChange(JSONObject.propertyChangeGlobalKeyword, oldThis, this);
-            this.propertyChangeSupportUpdate.firePropertyChange(key, oldValue, newValue);
-            this.propertyChangeSupportNotify.firePropertyChange(key, oldValue, newValue);
-        }, "json" + key).start();
+        this.propertyChangeSupportNotify.firePropertyChange(key, oldValue, newValue);
 
         return this;
     }
 
     public JSONObject notify(String key, Object oldValue, Object newValue) throws JSONException {
-        new Thread(() -> {
-            this.propertyChangeSupportNotify.firePropertyChange(key, oldValue, newValue);
-        }, "json" + key).start();
+        this.propertyChangeSupportNotify.firePropertyChange(key, oldValue, newValue);
 
         return this;
     }
@@ -1952,21 +1948,19 @@ private JSONObject updateOrRemove(JSONObject jo, boolean remove, boolean trigger
         }
 
         if (oldValues.size() > 0) {
-            new Thread(() -> {
-                if (triggerUpdate) {
-                    this.propertyChangeSupportUpdate.firePropertyChange(JSONObject.propertyChangeGlobalKeyword, oldThis, this);
-                }
+            if (triggerUpdate) {
+                this.propertyChangeSupportUpdate.firePropertyChange(JSONObject.propertyChangeGlobalKeyword, oldThis, this);
+            }
 
-                oldValues.forEach((key, oldValue) -> {
-                    final Object v2 = delValues.contains(key) ? null : newValues.get(key);
-                    final Object v1 = oldValue == null && v2 == null ? JSONObject.NULL : oldValue;
+            oldValues.forEach((key, oldValue) -> {
+                final Object v2 = delValues.contains(key) ? null : newValues.get(key);
+                final Object v1 = oldValue == null && v2 == null ? JSONObject.NULL : oldValue;
 
-                    if (triggerUpdate) {
-                        this.propertyChangeSupportUpdate.firePropertyChange(key, v1, v2);
-                    }
-                    this.propertyChangeSupportNotify.firePropertyChange(key, v1, v2);
-                });
-            }, "json_GLOBAL").start();
+                if (triggerUpdate) {
+                    this.propertyChangeSupportUpdate.firePropertyChange(key, v1, v2);
+                }
+                this.propertyChangeSupportNotify.firePropertyChange(key, v1, v2);
+            });
         }
 
         return this;

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

@@ -473,12 +473,6 @@ public void updateListenerGlobalTest() {
         j.update("myMapListener", "propertyChange456");
         j.update("myMapListener", "propertyChange789");
 
-        try {
-            Thread.sleep(1L);
-        } catch (InterruptedException ex) {
-            ex.printStackTrace();
-        }
-
         assertEquals(counter.get(), globalExecutions.get() * 3);
     }