From 2532668fbffb6e4b6a8340c4b2748f45083d3f13 Mon Sep 17 00:00:00 2001
From: Jacek Lewandowski <lewandowski.jacek@gmail.com>
Date: Mon, 2 Feb 2015 10:51:37 +0100
Subject: [PATCH] SPARK-3883: Refactored AkkaUtils.protocol method to not use
 Try

---
 core/src/main/scala/org/apache/spark/util/AkkaUtils.scala | 6 +++---
 1 file changed, 3 insertions(+), 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
index a442539ac1778..3d9c6192ff7f7 100644
--- 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 = {