Merge pull request #282 from art-community/fix/json-parsing-2

Fixed json parsing
art-community · May 13, 2020 · 8174d1a · 8174d1a
2 parents d6f130e + 7250a05
commit 8174d1a
Showing 1 changed file with 3 additions and 4 deletions.
diff --git a/application-json/src/main/java/ru/art/json/descriptor/JsonEntityReader.java b/application-json/src/main/java/ru/art/json/descriptor/JsonEntityReader.java
@@ -274,13 +274,12 @@ private Collection<CollectionValue<Entity>> parseArraysArray(JsonParser parser)
         List<CollectionValue<Entity>> array = dynamicArrayOf();
         JsonToken currentToken = parser.currentToken();
         do {
-            Collection<Entity> entities = dynamicArrayOf();
             if (currentToken != START_ARRAY) {
-                entities = parseEntityArray(parser);
+                array.add(entityCollection(parseEntityArray(parser)));
             }
             currentToken = parser.nextToken();
-            if (currentToken == END_ARRAY) {
-                array.add(entityCollection(entities));
+            if (currentToken == END_ARRAY && isEmpty(array)) {
+                array.add(entityCollection(dynamicArrayOf()));
             }
         } while (!parser.isClosed() && currentToken != END_ARRAY);
         return array;