Repository: wicket Updated Branches: refs/heads/wicket-6.x bf732ec61 -> 733bc3953
WICKET-6287 more code from openjson/openjson#8 Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/733bc395 Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/733bc395 Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/733bc395 Branch: refs/heads/wicket-6.x Commit: 733bc395372b1b35a6d5aaa6010c9916995d73d8 Parents: bf732ec Author: Andrea Del Bene <[email protected]> Authored: Sat May 13 16:55:58 2017 +0200 Committer: Andrea Del Bene <[email protected]> Committed: Sat May 13 16:57:44 2017 +0200 ---------------------------------------------------------------------- .../src/main/java/org/apache/wicket/ajax/json/JSONObject.java | 2 ++ 1 file changed, 2 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/733bc395/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 856e01e..b67c25e 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 @@ -979,6 +979,8 @@ public class JSONObject { } if (o.getClass().getPackage().getName().startsWith("java.")) { return o.toString(); + } else { + return new JSONObject(o); } } catch (Exception ignored) { }
