You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by mg...@apache.org on 2017/06/22 19:49:59 UTC
wicket git commit: WICKET-6400 Object with array property fails on
NPE when construction JSON object
Repository: wicket
Updated Branches:
refs/heads/wicket-6.x fe5573ee5 -> a4188f483
WICKET-6400 Object with array property fails on NPE when construction JSON object
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/a4188f48
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/a4188f48
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/a4188f48
Branch: refs/heads/wicket-6.x
Commit: a4188f483404bc3d0ba55ca5553968c2610dcfdd
Parents: fe5573e
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Thu Jun 22 21:49:32 2017 +0200
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Thu Jun 22 21:49:32 2017 +0200
----------------------------------------------------------------------
.../src/main/java/org/apache/wicket/ajax/json/JSONObject.java | 5 +++++
1 file changed, 5 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/a4188f48/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 39f56c5..8aac673 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
@@ -227,6 +227,11 @@ public class JSONObject {
private static Map<String, Object> propertiesAsMap(Object bean) throws JSONException {
Map<String, Object> props = new TreeMap<String, Object>();
+
+ if (bean instanceof JSONArray) {
+ return props;
+ }
+
try {
PropertyDescriptor[] properties = Introspector.getBeanInfo(bean.getClass(), Object.class)
.getPropertyDescriptors();