Merge remote branch 'zkim/master'

dakrone · Nov 7, 2011 · b2a7ce7 · b2a7ce7
2 parents d085c93 + 98ff87b
commit b2a7ce7
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/src/cheshire/core.clj b/src/cheshire/core.clj
@@ -49,9 +49,10 @@
   keywords? should be true if keyword keys are needed, the default is false
   maps will use strings as keywords."
   [^String string & [^Boolean keywords?]]
-  (parse
-   (.createJsonParser factory (StringReader. string))
-   true (or keywords? false) nil))
+  (when string
+    (parse
+     (.createJsonParser factory (StringReader. string))
+     true (or keywords? false) nil)))
 
 (defn parse-stream
   "Returns the Clojure object corresponding to the given reader, reader must

diff --git a/test/cheshire/test/core.clj b/test/cheshire/test/core.clj
@@ -51,6 +51,9 @@
          (json/parse-string
           (json/generate-string {"foo" 'clojure.core/map})))))
 
+(deftest test-nil
+  (is (nil? (json/parse-string nil true))))
+
 (deftest test-parsed-seq
   (let [br (BufferedReader. (StringReader. "1\n2\n3\n"))]
     (is (= (list 1 2 3) (json/parsed-seq br)))))