geode-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jensde...@apache.org
Subject incubator-geode git commit: GEODE-533: GFSH query swaps row values when they are null
Date Fri, 06 Nov 2015 16:54:15 GMT
Repository: incubator-geode
Updated Branches:
  refs/heads/develop dc5d343b7 -> 1b8a35734


GEODE-533: GFSH query swaps row values when they are null


Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/1b8a3573
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/1b8a3573
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/1b8a3573

Branch: refs/heads/develop
Commit: 1b8a35734a7808623f0247ad5f82de92aea70c14
Parents: dc5d343
Author: Jens Deppe <jdeppe@pivotal.io>
Authored: Fri Nov 6 08:53:25 2015 -0800
Committer: Jens Deppe <jdeppe@pivotal.io>
Committed: Fri Nov 6 08:53:25 2015 -0800

----------------------------------------------------------------------
 gemfire-json/src/main/java/org/json/JSONObject.java | 2 ++
 1 file changed, 2 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1b8a3573/gemfire-json/src/main/java/org/json/JSONObject.java
----------------------------------------------------------------------
diff --git a/gemfire-json/src/main/java/org/json/JSONObject.java b/gemfire-json/src/main/java/org/json/JSONObject.java
index 63676cc..6c478db 100755
--- a/gemfire-json/src/main/java/org/json/JSONObject.java
+++ b/gemfire-json/src/main/java/org/json/JSONObject.java
@@ -999,6 +999,8 @@ public class JSONObject {
                         Object result = method.invoke(bean, (Object[])null);
                         if (result != null) {
                             this.map.put(key, wrap(result));
+                        } else if (!method.getReturnType().isArray()) {
+                            this.map.put(key, JSONObject.NULL);
                         }
                     }
                 }


Mime
View raw message