refactored post-SPARK-1772

markhamstra · May 12, 2014 · 071d193 · 071d193
1 parent 1a6a35e
commit 071d193
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 46 deletions.
diff --git a/core/src/main/scala/org/apache/spark/executor/Executor.scala b/core/src/main/scala/org/apache/spark/executor/Executor.scala
@@ -29,7 +29,7 @@ import org.apache.spark._
 import org.apache.spark.deploy.SparkHadoopUtil
 import org.apache.spark.scheduler._
 import org.apache.spark.storage.{StorageLevel, TaskResultBlockId}
-import org.apache.spark.util.{UncaughtExceptionHandler, AkkaUtils, Utils}
+import org.apache.spark.util.{AkkaUtils, Utils}
 
 /**
  * Spark executor used with Mesos, YARN, and the standalone scheduler.

diff --git a/core/src/main/scala/org/apache/spark/util/UncaughtExceptionHandler.scala b/core/src/main/scala/org/apache/spark/util/UncaughtExceptionHandler.scala
diff --git a/core/src/main/scala/org/apache/spark/util/Utils.scala b/core/src/main/scala/org/apache/spark/util/Utils.scala
@@ -40,6 +40,7 @@ import tachyon.client.{TachyonFile,TachyonFS}
 
 import org.apache.spark.{Logging, SecurityManager, SparkConf, SparkException}
 import org.apache.spark.deploy.SparkHadoopUtil
+import org.apache.spark.executor.ExecutorUncaughtExceptionHandler
 import org.apache.spark.serializer.{DeserializationStream, SerializationStream, SerializerInstance}
 
 /**
@@ -786,7 +787,7 @@ private[spark] object Utils extends Logging {
     try {
       block
     } catch {
-      case t: Throwable => UncaughtExceptionHandler.uncaughtException(Thread.currentThread, t)
+      case t: Throwable => ExecutorUncaughtExceptionHandler.uncaughtException(t)
     }
   }