ARROW-402: Fix reference counting issue with empty buffers. Close #232

Change-Id: I87910c03d7ebca5a8edbf53d01f70c38ef339f04
apache · Dec 9, 2016 · 8995c92 · 8995c92
1 parent 14ed1be
commit 8995c92
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/java/vector/src/main/java/org/apache/arrow/vector/BitVector.java b/java/vector/src/main/java/org/apache/arrow/vector/BitVector.java
@@ -53,7 +53,6 @@ public BitVector(String name, BufferAllocator allocator) {
   public void load(ArrowFieldNode fieldNode, ArrowBuf data) {
     // When the vector is all nulls or all defined, the content of the buffer can be omitted
     if (data.readableBytes() == 0 && fieldNode.getLength() != 0) {
-      data.release();
       int count = fieldNode.getLength();
       allocateNew(count);
       int n = getSizeFromCount(count);

diff --git a/java/vector/src/test/java/org/apache/arrow/vector/TestVectorUnloadLoad.java b/java/vector/src/test/java/org/apache/arrow/vector/TestVectorUnloadLoad.java
@@ -187,7 +187,7 @@ public void testLoadEmptyValidityBuffer() throws IOException {
         new Field("intNull", true, new ArrowType.Int(32, true), Collections.<Field>emptyList())
         ));
     int count = 10;
-    ArrowBuf validity = allocator.getEmpty();
+    ArrowBuf validity = allocator.buffer(10).slice(0, 0);
     ArrowBuf[] values = new ArrowBuf[2];
     for (int i = 0; i < values.length; i++) {
       ArrowBuf arrowBuf = allocator.buffer(count * 4); // integers
@@ -236,6 +236,7 @@ public void testLoadEmptyValidityBuffer() throws IOException {
       for (ArrowBuf arrowBuf : values) {
         arrowBuf.release();
       }
+      validity.release();
     }
   }