fixed VPack parsing (arrays of specific length)

Author: Mark

ChangeLog

@@ -6,8 +6,9 @@ v4.1.10 (2017-02-xx)
 * added support serializing collections with null elements
 * added support serializing non-generic classes that extend collections
 * added support serializing/deserializing byte and Byte
-* fixed serialization of additionalFields for objects and maps
 * added default value "root" for user
+* fixed serialization of additionalFields for objects and maps
+* fixed VPack parsing (arrays of specific length)
 
 v4.1.9 (2017-02-10)
 ---------------------------

src/main/java/com/arangodb/velocypack/VPackBuilder.java

@@ -912,17 +912,17 @@ private VPackBuilder closeArray(final int tos, final List<Integer> in) {
 		final int offsetSize;
 		// can be 1, 2, 4 or 8 for the byte width of the offsets,
 		// the byte length and the number of subvalues:
-		if ((size - 1 - tos) + (needIndexTable ? n : 0) - (needNrSubs ? 6 : 7) <= 0xff) {
+		if ((size - tos) + (needIndexTable ? n : 0) - (needNrSubs ? 6 : 7) <= 0xff) {
 			// We have so far used _pos - tos bytes, including the reserved 8
 			// bytes for byte length and number of subvalues. In the 1-byte
 			// number
 			// case we would win back 6 bytes but would need one byte per
 			// subvalue
 			// for the index table
 			offsetSize = 1;
-		} else if ((size - 1 - tos) + (needIndexTable ? 2 * n : 0) <= 0xffff) {
+		} else if ((size - tos) + (needIndexTable ? 2 * n : 0) <= 0xffff) {
 			offsetSize = 2;
-		} else if (((size - 1 - tos) / 2) + ((needIndexTable ? 4 * n : 0) / 2) <= Integer.MAX_VALUE/* 0xffffffffu */) {
+		} else if (((size - tos) / 2) + ((needIndexTable ? 4 * n : 0) / 2) <= Integer.MAX_VALUE/* 0xffffffffu */) {
 			offsetSize = 4;
 		} else {
 			offsetSize = 8;

src/test/java/com/arangodb/velocypack/VPackBuilderTest.java

@@ -953,4 +953,35 @@ public void objectWithByteSizeOver65536() {
 		assertThat(vpack.get(foo).get(bar2).getLength(), is(0));
 	}
 
+	@Test
+	public void nestedArray() {
+		//@formatter:off
+		final VPackSlice s = new VPackBuilder()
+		.add(ValueType.OBJECT)
+			.add("dddddddddddddd", ValueType.ARRAY)
+				.add(ValueType.OBJECT)
+					.add("dddddddddddddd", ValueType.OBJECT)
+						.add("ddddddd",6)
+					.close()
+				.close()
+				.add(ValueType.OBJECT)
+					.add("ddddddddddddddddd","dddddddddddddddddddddd")
+				.close()
+				.add(ValueType.OBJECT)
+					.add("ddddddddddddddddddddddddd", ValueType.ARRAY).close()
+					.add("ddddddddddddddddda","dddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddd")
+					.add("dddddddddddddddddb","")
+					.add("dddddddddddddddddc",ValueType.ARRAY).close()
+					.add("ddddddddddddddd",-1)
+				.close()
+			.close()
+			.add("dddddddddd",0)
+		.close().slice();
+		//@formatter:on
+		assertThat(s.isObject(), is(true));
+		assertThat(s.get("dddddddddddddd").isArray(), is(true));
+		assertThat(s.get("dddddddddddddd").size(), is(3));
+		assertThat(s.get("dddddddddddddd").get(2).isObject(), is(true));
+	}
+
 }