diff --git a/transport/src/main/java/io/netty/channel/AbstractChannel.java b/transport/src/main/java/io/netty/channel/AbstractChannel.java index 84933a71d5..46fa5905c8 100644 --- a/transport/src/main/java/io/netty/channel/AbstractChannel.java +++ b/transport/src/main/java/io/netty/channel/AbstractChannel.java @@ -618,6 +618,11 @@ public abstract class AbstractChannel extends DefaultAttributeMap implements Cha @Override public void flush() { + ChannelOutboundBuffer outboundBuffer = AbstractChannel.this.outboundBuffer; + if (outboundBuffer == null) { + return; + } + outboundBuffer.addFlush(); flush0(); } @@ -629,7 +634,7 @@ public abstract class AbstractChannel extends DefaultAttributeMap implements Cha } final ChannelOutboundBuffer outboundBuffer = AbstractChannel.this.outboundBuffer; - if (outboundBuffer.isEmpty()) { + if (outboundBuffer == null || outboundBuffer.isEmpty()) { return; }