changed to use instanceof and added test

dremio · Sep 20, 2017 · c240378 · c240378
1 parent 2923a45
commit c240378
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/java/vector/src/main/java/org/apache/arrow/vector/complex/ListVector.java b/java/vector/src/main/java/org/apache/arrow/vector/complex/ListVector.java
@@ -324,7 +324,7 @@ public int getBufferSize() {
 
  @Override
  public Field getField() {
- if (getDataVector() == ZeroVector.INSTANCE) {
+ if (getDataVector() instanceof ZeroVector) {
  return new Field(name, fieldType, ImmutableList.of(new Field(DATA_VECTOR_NAME, FieldType.nullable(Null.INSTANCE), null)));
  }
  return new Field(name, fieldType, ImmutableList.of(getDataVector().getField()));

diff --git a/java/vector/src/test/java/org/apache/arrow/vector/TestListVector.java b/java/vector/src/test/java/org/apache/arrow/vector/TestListVector.java
@@ -628,4 +628,16 @@ public void testGetBufferAddress() throws Exception {
  assertEquals(offsetAddress, buffers.get(1).memoryAddress());
  }
  }
+
+ @Test
+ public void testConsistentChildName() throws Exception {
+ try (ListVector listVector = ListVector.empty("sourceVector", allocator)) {
+ String emptyListStr = listVector.getField().toString();
+ assertTrue(emptyListStr.contains(ListVector.DATA_VECTOR_NAME));
+
+ listVector.addOrGetVector(FieldType.nullable(MinorType.INT.getType()));
+ String emptyVectorStr = listVector.getField().toString();
+ assertTrue(emptyVectorStr.contains(ListVector.DATA_VECTOR_NAME));
+ }
+ }
 }