SPARK-3883: Refactored AkkaUtils.protocol method to not use Try

jacek-lewandowski · jacek-lewandowski · commit 2532668fbffb · 2015-02-02T13:02:10.000+01:00
diff --git a/core/src/main/scala/org/apache/spark/util/AkkaUtils.scala b/core/src/main/scala/org/apache/spark/util/AkkaUtils.scala
@@ -239,9 +239,9 @@ private[spark] object AkkaUtils extends Logging {
   }
 
   def protocol(actorSystem: ActorSystem): String = {
-    protocol(Try {
-      actorSystem.settings.config.getBoolean("akka.remote.netty.tcp.enable-ssl")
-    }.getOrElse(false))
+    val akkaConf = actorSystem.settings.config
+    val sslProp = "akka.remote.netty.tcp.enable-ssl"
+    protocol(akkaConf.hasPath(sslProp) && akkaConf.getBoolean(sslProp))
   }
 
   def protocol(ssl: Boolean = false): String = {

Original file line number	Diff line number	Diff line change
`@@ -239,9 +239,9 @@ private[spark] object AkkaUtils extends Logging {`
`239`	`239`	`}`
`240`	`240`
`241`	`241`	`def protocol(actorSystem: ActorSystem): String = {`
`242`		`- protocol(Try {`
`243`		`- actorSystem.settings.config.getBoolean("akka.remote.netty.tcp.enable-ssl")`
`244`		`- }.getOrElse(false))`
	`242`	`+ val akkaConf = actorSystem.settings.config`
	`243`	`+ val sslProp = "akka.remote.netty.tcp.enable-ssl"`
	`244`	`+ protocol(akkaConf.hasPath(sslProp) && akkaConf.getBoolean(sslProp))`
`245`	`245`	`}`
`246`	`246`
`247`	`247`	`def protocol(ssl: Boolean = false): String = {`