Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge branch 'master' into ostrich_3

  • Loading branch information...
commit a700fb1ed79d7ab9efa1ead511e87a025fdc9832 2 parents 28d0eeb + c109669
@bierbaum bierbaum authored
View
7 finagle-core/src/main/scala/com/twitter/finagle/builder/ServerBuilder.scala
@@ -25,7 +25,7 @@ import com.twitter.util.{Future, Promise, Return, Throw}
import channel.{ChannelClosingHandler, ServiceToChannelHandler, ChannelSemaphoreHandler}
import service.{ExpiringService, TimeoutFilter, StatsFilter}
-import stats.{StatsReceiver}
+import stats.StatsReceiver
trait Server {
/**
@@ -183,7 +183,7 @@ case class ServerBuilder[Req, Rep](
// Add the (shared) queueing handler *after* request
// serialization as it assumes one outstanding request per
// channel.
- queueingChannelHandler foreach { pipeline.addFirst("queue", _) }
+ queueingChannelHandler foreach { pipeline.addLast("queue", _) }
// Compose the service stack.
var service = codec.wrapServerChannel(serviceFactory())
@@ -217,9 +217,6 @@ case class ServerBuilder[Req, Rep](
// drain. We close the socket but wait for all handlers to
// complete (to drain them individually.) Note: this would be
// complicated by the presence of pipelining.
-
- // serialize requests?
-
val channelHandler = new ServiceToChannelHandler(service)
val handle = new ChannelHandle {
Please sign in to comment.
Something went wrong with that request. Please try again.