vpack: fixed ObjectIterator

Mark · Mark · commit bc48945f22a7 · 2016-07-13T16:29:22.000+02:00
diff --git a/src/main/java/com/arangodb/velocypack/util/ObjectIterator.java b/src/main/java/com/arangodb/velocypack/util/ObjectIterator.java
@@ -21,10 +21,7 @@ public ObjectIterator(final VPackSlice slice) throws VPackValueTypeException {
 			throw new VPackValueTypeException(ValueType.OBJECT);
 		}
 		if (size > 0) {
-			final byte head = slice.head();
-			if (head == 0x14) {
-				current = slice.keyAt(0).getStart();
-			}
+			current = slice.keyAt(0).getStart();
 		}
 	}
 
diff --git a/src/test/java/com/arangodb/velocypack/VPackSliceTest.java b/src/test/java/com/arangodb/velocypack/VPackSliceTest.java
@@ -862,6 +862,21 @@ public void arrayIterator() throws VPackException {
 		}
 	}
 
+	@Test
+	public void objectIterator() throws VPackException {
+		// {"a":"test","b":"test","c":"test"}
+		final String[] fields = new String[] { "a", "b", "c" };
+		final VPackSlice slice = new VPackSlice(new byte[] { 0x0b, 0x1b, 0x03, 0x41, 0x61, 0x44, 0x74, 0x65, 0x73, 0x74,
+				0x41, 0x62, 0x44, 0x74, 0x65, 0x73, 0x74, 0x41, 0x63, 0x44, 0x74, 0x65, 0x73, 0x74, 0x03, 0x0a, 0x11 });
+		int i = 0;
+		for (final Iterator<VPackSlice> iterator = slice.iterator(); iterator.hasNext();) {
+			final VPackSlice next = iterator.next();
+			Assert.assertEquals(fields[i++], next.getAsString());
+			final VPackSlice v = new VPackSlice(next.getVpack(), next.getStart() + next.getByteSize());
+			Assert.assertEquals("test", v.getAsString());
+		}
+	}
+
 	@Test(expected = VPackValueTypeException.class)
 	public void nonArrayNonObjectIterator() {
 		final VPackSlice vpack = new VPackSlice(new byte[] { 0x1a });

Original file line number	Diff line number	Diff line change
`@@ -21,10 +21,7 @@ public ObjectIterator(final VPackSlice slice) throws VPackValueTypeException {`
`21`	`21`	`throw new VPackValueTypeException(ValueType.OBJECT);`
`22`	`22`	`}`
`23`	`23`	`if (size > 0) {`
`24`		`- final byte head = slice.head();`
`25`		`- if (head == 0x14) {`
`26`		`- current = slice.keyAt(0).getStart();`
`27`		`- }`
	`24`	`+ current = slice.keyAt(0).getStart();`
`28`	`25`	`}`
`29`	`26`	`}`
`30`	`27`