From bdbf428365144dc8586276d42c071b44c389e4ff Mon Sep 17 00:00:00 2001 From: jfarrell Date: Fri, 4 Apr 2014 13:09:32 -0400 Subject: [PATCH] THRIFT-2402: byte count of FrameBuffer in AWAITING_CLOSE state is not subtracted from readBufferBytesAllocated Client: java Patch: jfarrell Addresses issue where changeSelectInterests would cause close() to occur in the AWAITING_CLOSE state and readBufferBytesAllocated was never called --- .../org/apache/thrift/server/AbstractNonblockingServer.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lib/java/src/org/apache/thrift/server/AbstractNonblockingServer.java b/lib/java/src/org/apache/thrift/server/AbstractNonblockingServer.java index 80da6cad..fd49d48d 100644 --- a/lib/java/src/org/apache/thrift/server/AbstractNonblockingServer.java +++ b/lib/java/src/org/apache/thrift/server/AbstractNonblockingServer.java @@ -455,7 +455,9 @@ public abstract class AbstractNonblockingServer extends TServer { public void close() { // if we're being closed due to an error, we might have allocated a // buffer that we need to subtract for our memory accounting. - if (state_ == FrameBufferState.READING_FRAME || state_ == FrameBufferState.READ_FRAME_COMPLETE) { + if (state_ == FrameBufferState.READING_FRAME || + state_ == FrameBufferState.READ_FRAME_COMPLETE || + state_ == FrameBufferState.AWAITING_CLOSE) { readBufferBytesAllocated.addAndGet(-buffer_.array().length); } trans_.close(); -- 2.17.1