[split] incorportated feedback from Marius

thaingo · Apr 27, 2011 · 8d97fd8 · 8d97fd8
1 parent d43ae37
commit 8d97fd8
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/finagle-core/src/main/scala/com/twitter/finagle/channel/IdleChannelHandler.scala b/finagle-core/src/main/scala/com/twitter/finagle/channel/IdleChannelHandler.scala
@@ -11,5 +11,6 @@ class IdleChannelHandler extends IdleStateAwareChannelHandler {
     if (e.getState() == IdleState.READER_IDLE || e.getState() == IdleState.WRITER_IDLE) {
       e.getChannel.close()
     }
+    super.channelIdle(ctx, e)
   }
 }
diff --git a/finagle-stream/src/main/scala/com/twitter/finagle/stream/HttpChunkToChannel.scala b/finagle-stream/src/main/scala/com/twitter/finagle/stream/HttpChunkToChannel.scala
@@ -5,15 +5,13 @@ import com.twitter.util.Future
 import java.util.concurrent.atomic.AtomicReference
 import org.jboss.netty.buffer.ChannelBuffer
 import org.jboss.netty.channel.{Channels, ChannelHandlerContext, ChannelStateEvent,
-  ExceptionEvent, MessageEvent}
+  ExceptionEvent, MessageEvent, SimpleChannelUpstreamHandler}
 import org.jboss.netty.handler.codec.http._
-import org.jboss.netty.handler.timeout.{IdleState, IdleStateAwareChannelUpstreamHandler,
-  IdleStateEvent}
 
 /**
  * Client handler for a streaming protocol.
  */
-class HttpChunkToChannel extends IdleStateAwareChannelUpstreamHandler {
+class HttpChunkToChannel extends SimpleChannelUpstreamHandler {
   private[this] val channelRef =
     new AtomicReference[com.twitter.concurrent.ChannelSource[ChannelBuffer]](null)
   @volatile var numObservers = 0