Fix a bug in deserializing empty JSON objects as JValues.

byenne · Jun 15, 2011 · 6fb62ff · 6fb62ff
1 parent 457ec62
commit 6fb62ff
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/src/main/scala/com/codahale/jerkson/deser/JValueDeserializer.scala b/src/main/scala/com/codahale/jerkson/deser/JValueDeserializer.scala
@@ -27,7 +27,7 @@ class JValueDeserializer(klass: Class[_]) extends JsonDeserializer[Object] {
         jp.nextToken()
         deserialize(jp, ctxt)
       }
-      case JsonToken.FIELD_NAME => {
+      case JsonToken.FIELD_NAME | JsonToken.END_OBJECT => {
         val fields = new ArrayBuffer[JField]
         while (jp.getCurrentToken != JsonToken.END_OBJECT) {
           val name = jp.getCurrentName

diff --git a/src/test/scala/com/codahale/jerkson/tests/ASTTypeSupportSpec.scala b/src/test/scala/com/codahale/jerkson/tests/ASTTypeSupportSpec.scala
@@ -116,5 +116,9 @@ class ASTTypeSupportSpec extends Spec {
     def `is parsable from a JSON object as a JValue` = {
       parse[JValue]("""{"id":1,"name":"Coda"}""") must beEqualTo(obj)
     }
+
+    def `is parsable from an empty JSON object` = {
+      parse[JObject]("""{}""") must beEqualTo(JObject(Nil))
+    }
   }
 }