Skip to content

Commit 1555418

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

File tree

2 files changed

+5
-2
lines changed

2 files changed

+5
-2
lines changed

common/src/main/java/com/genexus/json/JSONObjectWrapper.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,10 @@ public JSONObjectWrapper put(String key, Object value) throws JSONException {
5959
super.put(key, value);
6060
if (map == null)
6161
map = new LinkedHashMap<String, Object>();
62-
map.put(key, value);
62+
if (map.containsKey(key))
63+
map.replace(key, value);
64+
else
65+
map.put(key, value);
6366
return this;
6467
}
6568

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -903,7 +903,7 @@ private JSONObjectWrapper getControlProps(JSONObjectWrapper obj, String Control)
903903
obj.put(Control, ctrlProps);
904904
}
905905
else
906-
ctrlProps = new JSONObjectWrapper(crtPropsAux);
906+
ctrlProps = (JSONObjectWrapper)crtPropsAux;
907907
} catch (JSONException e) {
908908
}
909909
return ctrlProps;

0 commit comments

Comments
 (0)