Skip to content

Commit 53eee0d

Browse files
committed
Remove org.json lib fork and use new version of the API https://github.com/stleary/JSON-java
Issue: 105607 d844074
1 parent 3b607ce commit 53eee0d

File tree

1 file changed

+5
-2
lines changed

1 file changed

+5
-2
lines changed

gxweb/src/main/java/com/genexus/internet/HttpAjaxContext.java

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
import com.genexus.webpanels.WebUtils;
2525
import org.json.JSONArray;
2626
import org.json.JSONException;
27+
import org.json.JSONObject;
2728
import com.genexus.json.JSONObjectWrapper;
2829

2930
public class HttpAjaxContext extends HttpContextWeb
@@ -896,11 +897,13 @@ private JSONObjectWrapper getControlProps(JSONObjectWrapper obj, String Control)
896897
{
897898
JSONObjectWrapper ctrlProps = null;
898899
try {
899-
ctrlProps = new JSONObjectWrapper(obj.optJSONObject(Control));
900-
if (ctrlProps == null) {
900+
JSONObject crtPropsAux = obj.optJSONObject(Control);
901+
if (crtPropsAux == null) {
901902
ctrlProps = new JSONObjectWrapper();
902903
obj.put(Control, ctrlProps);
903904
}
905+
else
906+
ctrlProps = new JSONObjectWrapper(crtPropsAux);
904907
} catch (JSONException e) {
905908
}
906909
return ctrlProps;

0 commit comments

Comments
 (0)