From ade822011d44bd43e9ac78c1d29ec924a1f6e8e7 Mon Sep 17 00:00:00 2001
From: Mingfei <mingfei.shi@intel.com>
Date: Sat, 8 Jun 2013 16:26:45 +0800
Subject: [PATCH] not check return value of eventQueue.take

---
 .../scala/spark/scheduler/JobLogger.scala     | 28 +++++++++----------
 1 file changed, 13 insertions(+), 15 deletions(-)

diff --git a/core/src/main/scala/spark/scheduler/JobLogger.scala b/core/src/main/scala/spark/scheduler/JobLogger.scala
index f87acfd0b6..46b9fa974b 100644
--- a/core/src/main/scala/spark/scheduler/JobLogger.scala
+++ b/core/src/main/scala/spark/scheduler/JobLogger.scala
@@ -48,21 +48,19 @@ class JobLogger(val logDirName: String) extends SparkListener with Logging {
     override def run() {
       while (true) {
         val event = eventQueue.take
-        if (event != null) {
-          logDebug("Got event of type " + event.getClass.getName)
-          event match {
-            case JobLoggerOnJobStart(job, info) =>
-              processJobStartEvent(job, info)
-            case JobLoggerOnStageSubmitted(stage, info) =>
-              processStageSubmittedEvent(stage, info)
-            case JobLoggerOnStageCompleted(stageCompleted) =>
-              processStageCompletedEvent(stageCompleted)
-            case JobLoggerOnJobEnd(job, event) =>
-              processJobEndEvent(job, event)
-            case JobLoggerOnTaskEnd(event) =>
-              processTaskEndEvent(event)
-            case _ =>
-          }
+        logDebug("Got event of type " + event.getClass.getName)
+        event match {
+          case JobLoggerOnJobStart(job, info) =>
+            processJobStartEvent(job, info)
+          case JobLoggerOnStageSubmitted(stage, info) =>
+            processStageSubmittedEvent(stage, info)
+          case JobLoggerOnStageCompleted(stageCompleted) =>
+            processStageCompletedEvent(stageCompleted)
+          case JobLoggerOnJobEnd(job, event) =>
+            processJobEndEvent(job, event)
+          case JobLoggerOnTaskEnd(event) =>
+            processTaskEndEvent(event)
+          case _ =>
         }
       }
     }
-- 
GitLab