Repository: wicket Updated Branches: refs/heads/wicket-6.x 77bafbc7d -> eba3a3064
WICKET-6287 fix for https://github.com/openjson/openjson/issues/8 Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/eba3a306 Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/eba3a306 Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/eba3a306 Branch: refs/heads/wicket-6.x Commit: eba3a3064dc53505cfd09ec3f2ec1a7c044436f8 Parents: 77bafbc Author: Andrea Del Bene <[email protected]> Authored: Mon May 8 22:28:02 2017 +0200 Committer: Andrea Del Bene <[email protected]> Committed: Mon May 8 22:59:35 2017 +0200 ---------------------------------------------------------------------- .../src/main/java/org/apache/wicket/ajax/json/JSONObject.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/eba3a306/wicket-core/src/main/java/org/apache/wicket/ajax/json/JSONObject.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/ajax/json/JSONObject.java b/wicket-core/src/main/java/org/apache/wicket/ajax/json/JSONObject.java index b208946..856e01e 100644 --- a/wicket-core/src/main/java/org/apache/wicket/ajax/json/JSONObject.java +++ b/wicket-core/src/main/java/org/apache/wicket/ajax/json/JSONObject.java @@ -973,7 +973,8 @@ public class JSONObject { o instanceof Integer || o instanceof Long || o instanceof Short || - o instanceof String) { + o instanceof String || + o instanceof JSONString) { // adding JSONString to list for compatibility with org.json return o; } if (o.getClass().getPackage().getName().startsWith("java.")) {
