Cherry pick branch 'genexuslabs:FixFromJsonPerformance' into beta

iroqueta · Beta Bot · commit 7d842fadfe30 · 2025-05-22T21:58:05.000Z
diff --git a/common/src/main/java/com/genexus/GXBaseCollection.java b/common/src/main/java/com/genexus/GXBaseCollection.java
@@ -233,7 +233,7 @@ public void FromJSONObject(Object obj)
 			try
 			{
 				Object jsonObj = jsonArr.get(i);
-				if (jsonObj instanceof JSONObject)
+				if ((jsonObj instanceof JSONObject) && !(jsonObj instanceof JSONObjectWrapper))
 					jsonObj = new JSONObjectWrapper((JSONObject)jsonObj);
 				Class[] parTypes = new Class[] {};
 				Object[] arglist = new Object[] {};
diff --git a/common/src/main/java/com/genexus/json/JSONObjectWrapper.java b/common/src/main/java/com/genexus/json/JSONObjectWrapper.java
@@ -44,7 +44,8 @@ public JSONObjectWrapper(Map<?,?> m) {
 	}
 
 	public JSONObjectWrapper(JSONObject jsonObject) {
-		this(jsonObject.toMap());
+		super(jsonObject.toString());
+		initMap();
 	}
 
 	private void initMap() {

Original file line number	Diff line number	Diff line change
`@@ -233,7 +233,7 @@ public void FromJSONObject(Object obj)`
`233`	`233`	`try`
`234`	`234`	`{`
`235`	`235`	`Object jsonObj = jsonArr.get(i);`
`236`		`- if (jsonObj instanceof JSONObject)`
	`236`	`+ if ((jsonObj instanceof JSONObject) && !(jsonObj instanceof JSONObjectWrapper))`
`237`	`237`	`jsonObj = new JSONObjectWrapper((JSONObject)jsonObj);`
`238`	`238`	`Class[] parTypes = new Class[] {};`
`239`	`239`	`Object[] arglist = new Object[] {};`
Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,8 @@ public JSONObjectWrapper(Map<?,?> m) {`
`44`	`44`	`}`
`45`	`45`
`46`	`46`	`public JSONObjectWrapper(JSONObject jsonObject) {`
`47`		`- this(jsonObject.toMap());`
	`47`	`+ super(jsonObject.toString());`
	`48`	`+ initMap();`
`48`	`49`	`}`
`49`	`50`
`50`	`51`	`private void initMap() {`