BUG 2973 - correction of output for empty yang type

[yangtools.git] / yang / yang-data-codec-gson / src / main / java / org / opendaylight / yangtools / yang / data / codec / gson / JsonParserStream.java

diff --git a/yang/yang-data-codec-gson/src/main/java/org/opendaylight/yangtools/yang/data/codec/gson/JsonParserStream.java b/yang/yang-data-codec-gson/src/main/java/org/opendaylight/yangtools/yang/data/codec/gson/JsonParserStream.java
index 7922b95197b63badb9676c4e95286677017ad9ab..f7eeff3f01bf87a365860e59ae070fd2d76c0d0d 100644 (file)
--- a/yang/yang-data-codec-gson/src/main/java/org/opendaylight/yangtools/yang/data/codec/gson/JsonParserStream.java
+++ b/yang/yang-data-codec-gson/src/main/java/org/opendaylight/yangtools/yang/data/codec/gson/JsonParserStream.java
@@ -127,8 +127,12 @@ public final class JsonParserStream implements Closeable, Flushable {
         case BEGIN_ARRAY:
             in.beginArray();
             while (in.hasNext()) {
-                final AbstractNodeDataWithSchema newChild = newArrayEntry(parent);
-                read(in, newChild);
+                if (parent instanceof LeafNodeDataWithSchema) {
+                    read(in, parent);
+                } else {
+                    final AbstractNodeDataWithSchema newChild = newArrayEntry(parent);
+                    read(in, newChild);
+                }
             }
             in.endArray();
             return;
@@ -184,8 +188,8 @@ public final class JsonParserStream implements Closeable, Flushable {
         }
     }
 
-    private boolean isArray(final AbstractNodeDataWithSchema parent) {
-        return parent instanceof ListNodeDataWithSchema || parent instanceof ListNodeDataWithSchema;
+    private static boolean isArray(final AbstractNodeDataWithSchema parent) {
+        return parent instanceof ListNodeDataWithSchema || parent instanceof LeafListNodeDataWithSchema;
     }
 
     private AbstractNodeDataWithSchema newArrayEntry(final AbstractNodeDataWithSchema parent) {