@@ -171,7 +171,6 @@ public String getName() {
 
   @Override
   public ArrowBuf getEmpty() {
-    assertOpen();
     return empty;
   }
 
@@ -236,8 +235,6 @@ public ArrowBuf buffer(final int initialRequestSize) {
   }
 
   private ArrowBuf createEmpty() {
-    assertOpen();
-
     return new ArrowBuf(new AtomicInteger(), null, AllocationManager.EMPTY, null, null, 0, 0, true);
   }
 
 
@@ -59,8 +59,6 @@ public static List<ArrowBuf> unload(List<BufferBacked> vectors) {
     return result;
   }
 
-  // TODO: Nullable vectors extend BaseDataValueVector but do not use the data field
-  // We should fix the inheritance tree
   protected ArrowBuf data;
 
   public BaseDataValueVector(String name, BufferAllocator allocator) {
@@ -70,23 +68,11 @@ public BaseDataValueVector(String name, BufferAllocator allocator) {
 
   @Override
   public void clear() {
-    if (data != null) {
-      data.release();
-    }
+    data.release();
     data = allocator.getEmpty();
     super.clear();
   }
 
-  @Override
-  public void close() {
-    clear();
-    if (data != null) {
-      data.release();
-      data = null;
-    }
-    super.close();
-  }
-
   @Override
   public TransferPair getTransferPair(String ref, BufferAllocator allocator, CallBack callBack) {
     return getTransferPair(ref, allocator);
 
@@ -736,6 +736,16 @@ public void testFillEmptiesUsage() {
     }
   }
 
+  @Test
+  public void testMultipleClose() {
+    BufferAllocator vectorAllocator = allocator.newChildAllocator("vector_allocator", 0, Long.MAX_VALUE);
+    NullableIntVector vector = newVector(NullableIntVector.class, EMPTY_SCHEMA_PATH, MinorType.INT, vectorAllocator);
+    vector.close();
+    vectorAllocator.close();
+    vector.close();
+    vectorAllocator.close();
+  }
+
   public static void setBytes(int index, byte[] bytes, NullableVarCharVector vector) {
     final int currentOffset = vector.values.offsetVector.getAccessor().get(index);
Original file line number	Diff line number	Diff line change
`@@ -171,7 +171,6 @@ public String getName() {`
`171`	`171`
`172`	`172`	`@Override`
`173`	`173`	`public ArrowBuf getEmpty() {`
`174`		`- assertOpen();`
`175`	`174`	`return empty;`
`176`	`175`	`}`
`177`	`176`
`@@ -236,8 +235,6 @@ public ArrowBuf buffer(final int initialRequestSize) {`
`236`	`235`	`}`
`237`	`236`
`238`	`237`	`private ArrowBuf createEmpty() {`
`239`		`- assertOpen();`
`240`		`-`
`241`	`238`	`return new ArrowBuf(new AtomicInteger(), null, AllocationManager.EMPTY, null, null, 0, 0, true);`
`242`	`239`	`}`
`243`	`240`