0.74.1

* Fix NPE in node iterators.

Author: Aaron

build.gradle

@@ -5,7 +5,7 @@ subprojects {
     apply plugin: 'maven'
 
     group 'org.iot-dsa'
-    version '0.74.0'
+    version '0.74.1'
 
     targetCompatibility = JavaVersion.VERSION_1_8
     sourceCompatibility = JavaVersion.VERSION_1_8

dslink-v2-api/src/main/java/org/iot/dsa/node/DSNode.java

@@ -1638,10 +1638,13 @@ private class NodeIterator implements Iterator<DSInfo<DSNode>> {
         private DSInfo<DSNode> next;
 
         NodeIterator() {
-            if (firstChild.isNode()) {
-                next = (DSInfo<DSNode>) firstChild;
-            } else {
-                next = firstChild.nextNode();
+            DSInfo<?> first = getFirstInfo();
+            if (first != null) {
+                if (first.isNode()) {
+                    next = (DSInfo<DSNode>) first;
+                } else {
+                    next = first.nextNode();
+                }
             }
         }
 
@@ -1721,10 +1724,13 @@ private class ValueIterator implements Iterator<DSInfo<DSIValue>> {
         private DSInfo<DSIValue> next;
 
         ValueIterator() {
-            if (firstChild.isValue()) {
-                next = (DSInfo<DSIValue>) firstChild;
-            } else {
-                next = firstChild.nextValue();
+            DSInfo<?> first = getFirstInfo();
+            if (first != null) {
+                if (first.isValue()) {
+                    next = (DSInfo<DSIValue>) first;
+                } else {
+                    next = first.nextValue();
+                }
             }
         }