You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by ad...@apache.org on 2017/05/08 20:27:21 UTC
wicket git commit: WICKET-6287 fix for
https://github.com/openjson/openjson/issues/8
Repository: wicket
Updated Branches:
refs/heads/wicket-7.x fb0460b36 -> c83c6fcb6
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/c83c6fcb
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/c83c6fcb
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/c83c6fcb
Branch: refs/heads/wicket-7.x
Commit: c83c6fcb628f1024ef53ecf32cf5722277895719
Parents: fb0460b
Author: Andrea Del Bene <ad...@apache.org>
Authored: Mon May 8 22:28:02 2017 +0200
Committer: Andrea Del Bene <ad...@apache.org>
Committed: Mon May 8 22:28:02 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/c83c6fcb/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 9946da7..8a9d0d1 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
@@ -1001,7 +1001,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.") || o instanceof Enum<?>) {