Remove org.json lib fork and use new version of the API https://github.com/stleary/JSON-java

iroqueta · iroqueta · commit 04003dc7ac9b · 2024-05-23T12:14:57.000-03:00
Issue: 105607 d844074
diff --git a/common/src/main/java/com/genexus/xml/GXXMLSerializable.java b/common/src/main/java/com/genexus/xml/GXXMLSerializable.java
@@ -354,6 +354,8 @@ public void FromJSONObject(Object obj)
 		}
 		else
 		{
+			if (obj instanceof JSONObject)
+				obj = new JSONObjectWrapper((JSONObject)obj);
 			Iterator it = getFromJSONObjectOrderIterator(((JSONObjectWrapper)obj).keys());
 			while(it.hasNext())
 			{

Original file line number	Diff line number	Diff line change
`@@ -354,6 +354,8 @@ public void FromJSONObject(Object obj)`
`354`	`354`	`}`
`355`	`355`	`else`
`356`	`356`	`{`
	`357`	`+ if (obj instanceof JSONObject)`
	`358`	`+ obj = new JSONObjectWrapper((JSONObject)obj);`
`357`	`359`	`Iterator it = getFromJSONObjectOrderIterator(((JSONObjectWrapper)obj).keys());`
`358`	`360`	`while(it.hasNext())`
`359`	`361`	`{`