getString() now returns null instead of "null" when the value is null

yusuke · yusuke · commit deb701de4c88 · 2010-12-28T17:07:55.000+09:00
diff --git a/JSONObject.java b/JSONObject.java
@@ -627,6 +627,9 @@ public static String[] getNames(Object object) {
      * @throws   JSONException if the key is not found.
      */
     public String getString(String key) throws JSONException {
+        if(isNull(key)){
+            return null;
+        }
         return get(key).toString();
     }
 
diff --git a/Test.java b/Test.java
@@ -67,6 +67,18 @@ public void testXML() throws Exception {
         assertEquals("<test><blank/><empty/></test>", XML.toString(j));
     }
 
+    public void testNull() throws Exception {
+        JSONObject j;
+
+        j = new JSONObject("{\"message\":\"null\"}");
+        assertFalse(j.isNull("message"));
+        assertEquals("null", j.getString("message"));
+
+        j = new JSONObject("{\"message\":null}");
+        assertTrue(j.isNull("message"));
+        assertEquals(null, j.getString("message"));
+    }
+
     public void testJSON() throws Exception {
         Iterator it;
         JSONArray a;

Original file line number	Diff line number	Diff line change
`@@ -627,6 +627,9 @@ public static String[] getNames(Object object) {`
`627`	`627`	`* @throws JSONException if the key is not found.`
`628`	`628`	`*/`
`629`	`629`	`public String getString(String key) throws JSONException {`
	`630`	`+ if(isNull(key)){`
	`631`	`+ return null;`
	`632`	`+ }`
`630`	`633`	`return get(key).toString();`
`631`	`634`	`}`
`632`	`635`