Merge "Increase code coverage auth fs"

[aaf/authz.git] / misc / rosetta / src / main / java / org / onap / aaf / misc / rosetta / marshal / ObjMarshal.java

diff --git a/misc/rosetta/src/main/java/org/onap/aaf/misc/rosetta/marshal/ObjMarshal.java b/misc/rosetta/src/main/java/org/onap/aaf/misc/rosetta/marshal/ObjMarshal.java
index eaa7a74..cb2c478 100644 (file)
--- a/misc/rosetta/src/main/java/org/onap/aaf/misc/rosetta/marshal/ObjMarshal.java
+++ b/misc/rosetta/src/main/java/org/onap/aaf/misc/rosetta/marshal/ObjMarshal.java
@@ -22,6 +22,7 @@
 package org.onap.aaf.misc.rosetta.marshal;
 
 import java.util.Iterator;
+import java.util.NoSuchElementException;
 
 import org.onap.aaf.misc.rosetta.Ladder;
 import org.onap.aaf.misc.rosetta.Marshal;
@@ -72,26 +73,25 @@ public abstract class ObjMarshal<T> extends Marshal<T> {
                        } else {
                                ladder.push(DONE_ITERATOR);
                        }
-               } else if (DONE_ITERATOR.equals(iter)) {
-               } else {
+               } else if (!DONE_ITERATOR.equals(iter)) {
                        FieldsIterator fields = (FieldsIterator)iter;
                        ladder.ascend(); // look at field info
-                               Iterator<?> currFieldIter = ladder.peek();
-                               Marshal<T> marshal;
-                               if(currFieldIter==null) {
-                                       marshal=fields.next();
-                               } else if(!DONE_ITERATOR.equals(currFieldIter)) {
-                                       marshal=fields.peek();
-                                       if(marshal==null && fields.hasNext())marshal=fields.next();
-                               } else if(fields.hasNext()) {
-                                       marshal=fields.next();
-                                       ladder.push(null);
-                               } else {
-                                       marshal=null;
-                               }
-                               
-                               if(marshal!=null)
-                                       parsed = marshal.parse(in, parsed);
+                       Iterator<?> currFieldIter = ladder.peek();
+                       Marshal<T> marshal;
+                       if(currFieldIter==null) {
+                               marshal=fields.next();
+                       } else if(!DONE_ITERATOR.equals(currFieldIter)) {
+                               marshal=fields.peek();
+                               if(marshal==null && fields.hasNext())marshal=fields.next();
+                       } else if(fields.hasNext()) {
+                               marshal=fields.next();
+                               ladder.push(null);
+                       } else {
+                               marshal=null;
+                       }
+
+                       if(marshal!=null)
+                               parsed = marshal.parse(in, parsed);
                        ladder.descend();
                        if(marshal==null || parsed.event==NONE) {
                                parsed.event = END_OBJ;
@@ -111,6 +111,9 @@ public abstract class ObjMarshal<T> extends Marshal<T> {
 
                @Override
                public Marshal<T> next() {
+                       if(!hasNext()) {
+                               throw new NoSuchElementException();
+                       }
                        return pml[++idx];
                }