From 7cf36636e76db656c07c9c48ea9a0bc6a3324a3d Mon Sep 17 00:00:00 2001
From: Ziver Koc <Ziver@users.noreply.github.com>
Date: Thu, 29 Oct 2015 10:51:06 +0100
Subject: [PATCH] Bugfix in JSONParser

---
 src/zutil/parser/json/JSONParser.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/zutil/parser/json/JSONParser.java b/src/zutil/parser/json/JSONParser.java
index bc3195f..9e51780 100755
--- a/src/zutil/parser/json/JSONParser.java
+++ b/src/zutil/parser/json/JSONParser.java
@@ -110,8 +110,10 @@ public class JSONParser extends Parser {
                 root = new DataNode(DataType.Map);
                 while(end.i == CONTINUE) {
                     key = parse(in, end);
+                    if(end.i == END_WITH_NULL) // Break if there is no more data
+                        break;
                     node = parse(in, end);
-                    if(end.i != END_WITH_NULL)
+                    if(end.i != END_WITH_NULL) // Only add the entry if it is a value
                         root.set( key.toString(), node );
                 }
                 end.i = CONTINUE;