From b49b3d9c567855a2bca71c8f069155104011b06b Mon Sep 17 00:00:00 2001 From: Norman Maurer Date: Mon, 31 Dec 2012 11:35:25 +0100 Subject: [PATCH] [#879] Notify correct ChannelFuture for queued FileRegions --- .../src/main/java/io/netty/channel/AbstractChannel.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/transport/src/main/java/io/netty/channel/AbstractChannel.java b/transport/src/main/java/io/netty/channel/AbstractChannel.java index 6320576595..bd891f2a22 100644 --- a/transport/src/main/java/io/netty/channel/AbstractChannel.java +++ b/transport/src/main/java/io/netty/channel/AbstractChannel.java @@ -422,13 +422,13 @@ public abstract class AbstractChannel extends DefaultAttributeMap implements Cha if (region == null) { // no region present means the next flush task was to directly flush // the outbound buffer - flushNotifierAndFlush(future); + flushNotifierAndFlush(next.future); } else { // flush the region now - doFlushFileRegion(region, future); + doFlushFileRegion(region, next.future); } } catch (Throwable cause) { - future.setFailure(cause); + next.future.setFailure(cause); } } else { // notify the flush futures