From 023201f68436109c67cddd9078732f6ce54f7a1f Mon Sep 17 00:00:00 2001 From: Norman Maurer Date: Fri, 12 Jul 2013 10:58:38 +0200 Subject: [PATCH] [#1570] ChunkedWriteHandler.discard(..) must not call fireExceptionCaught(...) --- .../io/netty/handler/stream/ChunkedWriteHandler.java | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/handler/src/main/java/io/netty/handler/stream/ChunkedWriteHandler.java b/handler/src/main/java/io/netty/handler/stream/ChunkedWriteHandler.java index 558defa2c1..dd53cdbc0c 100644 --- a/handler/src/main/java/io/netty/handler/stream/ChunkedWriteHandler.java +++ b/handler/src/main/java/io/netty/handler/stream/ChunkedWriteHandler.java @@ -152,7 +152,7 @@ public class ChunkedWriteHandler super.channelInactive(ctx); } - private void discard(final ChannelHandlerContext ctx, Throwable cause) { + private void discard(Throwable cause) { for (;;) { PendingWrite currentWrite = this.currentWrite; @@ -190,16 +190,12 @@ public class ChunkedWriteHandler currentWrite.fail(cause); } } - - if (cause != null) { - ctx.fireExceptionCaught(cause); - } } private void doFlush(final ChannelHandlerContext ctx) throws Exception { Channel channel = ctx.channel(); if (!channel.isActive()) { - discard(ctx, null); + discard(null); return; } boolean needsFlush; @@ -312,7 +308,7 @@ public class ChunkedWriteHandler ctx.flush(); } if (!channel.isActive()) { - discard(ctx, new ClosedChannelException()); + discard(new ClosedChannelException()); return; } }