Apache
/
activemq-artemis
mirror of https://github.com/apache/activemq-artemis.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ARTEMIS-3045 NettyConnection should null-check Netty buffer

This commit is contained in:
franz1981 2021-03-23 21:35:53 +01:00 committed by clebertsuconic
parent 8d24bfa646
commit 7bd2a4d080
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
artemis-core-client/src/main/java/org/apache/activemq/artemis/core/remoting/impl/netty/NettyConnection.java
View File

@ -27,6 +27,7 @@ import io.netty.buffer.ByteBuf;
import io.netty.channel.Channel;
import io.netty.channel.ChannelFuture;
import io.netty.channel.ChannelFutureListener;
import io.netty.channel.ChannelOutboundBuffer;
import io.netty.channel.ChannelPromise;
import io.netty.channel.EventLoop;
import io.netty.util.concurrent.FastThreadLocal;
@ -99,7 +100,11 @@ public class NettyConnection implements Connection {
* Returns an estimation of the current size of the write buffer in the channel.
*/
private static long batchBufferSize(Channel channel) {
return channel.unsafe().outboundBuffer().totalPendingWriteBytes();
final ChannelOutboundBuffer outboundBuffer = channel.unsafe().outboundBuffer();
if (outboundBuffer == null) {
return 0;
}
return outboundBuffer.totalPendingWriteBytes();
}
public final Channel getNettyChannel() {
@ -248,10 +253,10 @@ public class NettyConnection implements Connection {
// This is called periodically to flush the batch buffer
@Override
public final void checkFlushBatchBuffer() {
if (this.batchingEnabled) {
if (batchingEnabled) {
// perform the flush only if necessary
if (batchBufferSize(this.channel) > 0 && !channel.isWritable()) {
this.channel.flush();
if (batchBufferSize(channel) > 0) {
channel.flush();
}
}
}