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

rxin · Feb 2, 2015 · 2532668 · 2532668
1 parent 90a8762
commit 2532668
Showing 1 changed file with 3 additions and 3 deletions.
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 = {