andreacavalli/netty5
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[#836] Correctly reset timeout on sendFile(...)

Browse Source
This commit is contained in:
Norman Maurer 2012-12-19 21:16:41 +01:00
parent 695665a4cf
commit 1f9d165583
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
handler/src/main/java/io/netty/handler/timeout/WriteTimeoutHandler.java
View File

@ -23,6 +23,7 @@ import io.netty.channel.ChannelHandlerAdapter;
import io.netty.channel.ChannelHandlerContext; import io.netty.channel.ChannelHandlerContext;
import io.netty.channel.ChannelInitializer; import io.netty.channel.ChannelInitializer;
import io.netty.channel.ChannelOperationHandlerAdapter; import io.netty.channel.ChannelOperationHandlerAdapter;
import io.netty.channel.FileRegion;
import java.util.concurrent.ScheduledFuture; import java.util.concurrent.ScheduledFuture;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
@ -104,6 +105,19 @@ public class WriteTimeoutHandler extends ChannelOperationHandlerAdapter {
@Override @Override
public void flush(final ChannelHandlerContext ctx, final ChannelFuture future) throws Exception { public void flush(final ChannelHandlerContext ctx, final ChannelFuture future) throws Exception {
scheduleTimeout(ctx, future);
super.flush(ctx, future);
}
@Override
public void sendFile(ChannelHandlerContext ctx, FileRegion region, ChannelFuture future) throws Exception {
scheduleTimeout(ctx, future);
super.sendFile(ctx, region, future);
}
private void scheduleTimeout(final ChannelHandlerContext ctx, final ChannelFuture future) {
if (timeoutMillis > 0) { if (timeoutMillis > 0) {
// Schedule a timeout. // Schedule a timeout.
final ScheduledFuture<?> sf = ctx.executor().schedule(new Runnable() { final ScheduledFuture<?> sf = ctx.executor().schedule(new Runnable() {
@ -128,8 +142,6 @@ public class WriteTimeoutHandler extends ChannelOperationHandlerAdapter {
} }
}); });
} }
super.flush(ctx, future);
} }
protected void writeTimedOut(ChannelHandlerContext ctx) throws Exception { protected void writeTimedOut(ChannelHandlerContext ctx) throws Exception {