From a5a7d7f10693f06c51b57535e299236ebcfa37c0 Mon Sep 17 00:00:00 2001
From: Joshi <rekhajoshm@gmail.com>
Date: Thu, 25 Jun 2015 22:01:12 -0700
Subject: [PATCH] Fix for SparkContext stop behavior

---
 core/src/main/scala/org/apache/spark/SparkEnv.scala | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/core/src/main/scala/org/apache/spark/SparkEnv.scala b/core/src/main/scala/org/apache/spark/SparkEnv.scala
index a4b511b4f0ea0..b2fcc89045ff7 100644
--- a/core/src/main/scala/org/apache/spark/SparkEnv.scala
+++ b/core/src/main/scala/org/apache/spark/SparkEnv.scala
@@ -107,8 +107,10 @@ class SparkEnv (
         outputCommitCoordinator.stop()
         rpcEnv.shutdown()
       } catch {
-        case NonFatal(e) =>
+        case e: ServerStateException =>
           logInfo("Exception while SparkEnv stop", e)
+        case NonFatal(e) =>
+          throw e;
       }
 
       // Unfortunately Akka's awaitTermination doesn't actually wait for the Netty server to shut