Skip to content

ARROW-105: Fix BaseAllocator.java NPE when assertions are disabled #64

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
laurentgo wants to merge 1 commit into from
Closed

ARROW-105: Fix BaseAllocator.java NPE when assertions are disabled #64

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 14 additions & 6 deletions java/memory/src/main/java/org/apache/arrow/memory/BaseAllocator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,7 @@ protected BaseAllocator(

}

@Override
public void assertOpen() {
if (AssertionUtil.ASSERT_ENABLED) {
if (isClosed) {
Expand Down Expand Up @@ -287,6 +288,7 @@ public Reservation() {
}
}

@Override
public boolean add(final int nBytes) {
assertOpen();

Expand All @@ -308,6 +310,7 @@ public boolean add(final int nBytes) {
return true;
}

@Override
public ArrowBuf allocateBuffer() {
assertOpen();

Expand All @@ -319,14 +322,17 @@ public ArrowBuf allocateBuffer() {
return arrowBuf;
}

@Override
public int getSize() {
return nBytes;
}

@Override
public boolean isUsed() {
return used;
}

@Override
public boolean isClosed() {
return closed;
}
Expand Down Expand Up @@ -364,6 +370,7 @@ public void close() {
closed = true;
}

@Override
public boolean reserve(int nBytes) {
assertOpen();

Expand Down Expand Up @@ -509,6 +516,7 @@ public synchronized void close() {

}

@Override
public String toString() {
final Verbosity verbosity = logger.isTraceEnabled() ? Verbosity.LOG_WITH_STACKTRACE
: Verbosity.BASIC;
Expand All @@ -523,6 +531,7 @@ public String toString() {
*
* @return A Verbose string of current allocator state.
*/
@Override
public String toVerboseString() {
final StringBuilder sb = new StringBuilder();
print(sb, 0, Verbosity.LOG_WITH_STACKTRACE);
Expand Down Expand Up @@ -575,13 +584,12 @@ void verifyAllocator() {
* when any problems are found
*/
private void verifyAllocator(final IdentityHashMap<UnsafeDirectLittleEndian, BaseAllocator> buffersSeen) {
synchronized (DEBUG_LOCK) {

// The remaining tests can only be performed if we're in debug mode.
if (!DEBUG) {
return;
}
// The remaining tests can only be performed if we're in debug mode.
if (!DEBUG) {
return;
}

synchronized (DEBUG_LOCK) {
final long allocated = getAllocatedMemory();

// verify my direct descendants
Expand Down