Merge pull request #54 from BlackEdder/null

Fix #53: JSON_TYPE.NULL results in exception
BlackEdder · Nov 17, 2016 · 4ec28e7 · 4ec28e7
2 parents 9e5e4a6 + 314d456
commit 4ec28e7
Showing 1 changed file with 13 additions and 1 deletion.
diff --git a/source/painlessjson/painlessjson.d b/source/painlessjson/painlessjson.d
@@ -612,8 +612,20 @@ T fromJSON(T, SerializationOptions options = defaultSerializatonOptions)(in JSON
     {
         return T._fromJSON(json);
     }
-    else
+    else 
+    {
+        if (json.type == JSON_TYPE.NULL)
+            return T.init;
         return defaultFromJSON!(T,options)(json);
+    }
+}
+
+unittest {
+    struct P
+    { string name; }
+
+    auto jv = parseJSON(`{"name": null}`);
+    auto j = fromJSON!P(jv);
 }
 
 /// Converting common types