Permalink
Browse files

Merge branch 'master' of github.com:twitter/finagle

  • Loading branch information...
2 parents 1f197a7 + 4950de6 commit 3efbc60ceef8c7db91c2fa1c708f1c0a7515242c @mariusae mariusae committed Feb 15, 2011
@@ -4,10 +4,8 @@ import org.jboss.netty.channel.ChannelPipelineFactory
import com.twitter.util.Future
-import com.twitter.finagle.channel.ChannelService
-
/**
- * The codec provides protocol encoding via netty pipelines.
+ * The codec provides protocol encoding and decoding via netty pipelines.
*/
// TODO: do we want to split this into client/server codecs?
trait Codec[Req, Rep] {
@@ -260,7 +260,7 @@ case class ClientBuilder[Req, Rep](
val cluster = _cluster.get
val protocol = _protocol.get
- val hostFactories = cluster mapHosts { host =>
+ val hostFactories = cluster mkFactories { host =>
// The per-host stack is as follows:
//
// ChannelService
@@ -16,7 +16,7 @@ trait Cluster {
* Produce a sequence of brokers that changes as servers join and
* leave the cluster.
*/
- def mapHosts[Req, Rep](f: SocketAddress => ServiceFactory[Req, Rep]): Seq[ServiceFactory[Req, Rep]]
+ def mkFactories[Req, Rep](f: SocketAddress => ServiceFactory[Req, Rep]): Seq[ServiceFactory[Req, Rep]]
def join(address: SocketAddress)
}
@@ -26,7 +26,7 @@ class SocketAddressCluster(underlying: Seq[SocketAddress])
{
private[this] var self = underlying
- def mapHosts[Req, Rep](f: SocketAddress => ServiceFactory[Req, Rep]) = self map f
+ def mkFactories[Req, Rep](f: SocketAddress => ServiceFactory[Req, Rep]) = self map f
def join(address: SocketAddress) {
self = underlying ++ Seq(address)
@@ -3,6 +3,6 @@
project.organization=com.twitter
project.name=finagle
sbt.version=0.7.4
-project.version=1.1.23-SNAPSHOT
+project.version=1.1.24-SNAPSHOT
build.scala.versions=2.8.1
project.initialize=false

0 comments on commit 3efbc60

Please sign in to comment.