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

twitter · Dec 10, 2010 · b86521e · b86521e
2 parents a0d7a94 + 31e0f2a
commit b86521e
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/src/main/scala/com/twitter/finagle/builder/Server.scala b/src/main/scala/com/twitter/finagle/builder/Server.scala
@@ -155,7 +155,7 @@ case class ServerBuilder(
   def logger(logger: Logger) = copy(_logger = Some(logger))
 
   def tls(path: String, password: String) =
-    copy(_tls = Option(Ssl(path, password)))
+    copy(_tls = Some(Ssl(path, password)))
 
   def startTls(value: Boolean) =
     copy(_startTls = true)