Address rxin's review feedback.

apache · Nov 15, 2014 · afcc8d6 · afcc8d6
1 parent 2a2e92d
commit afcc8d6
Showing 1 changed file with 14 additions and 14 deletions.
diff --git a/core/src/main/scala/org/apache/spark/network/nio/ConnectionManager.scala b/core/src/main/scala/org/apache/spark/network/nio/ConnectionManager.scala
@@ -914,23 +914,23 @@ private[nio] class ConnectionManager(
     val timeoutTask: TimerTask = new TimerTask {
       override def run(timeout: Timeout): Unit = {
         messageStatuses.synchronized {
-          messageStatuses.remove(messageId).foreach ( s => {
+          messageStatuses.remove(messageId).foreach { s =>
             val e = new IOException("sendMessageReliably failed because ack " +
               s"was not received within $ackTimeout sec")
-            Option(promiseReference.get) match {
-              case Some(p) =>
-                // Attempt to fail the promise with a Timeout exception
-                if (!p.tryFailure(e)) {
-                  // If we reach here, then someone else has already signalled success or failure
-                  // on this promise, so log a warning:
-                  logError("Ignore error because promise is completed", e)
-                }
-              case None =>
-                // The WeakReference was empty, which should never happen because
-                // sendMessageReliably's caller should have a strong reference to promise.future;
-                logError("Promise was garbage collected; this should never happen!", e)
+            val p = promiseReference.get
+            if (p != null) {
+              // Attempt to fail the promise with a Timeout exception
+              if (!p.tryFailure(e)) {
+                // If we reach here, then someone else has already signalled success or failure
+                // on this promise, so log a warning:
+                logError("Ignore error because promise is completed", e)
+              }
+            } else {
+              // The WeakReference was empty, which should never happen because
+              // sendMessageReliably's caller should have a strong reference to promise.future;
+              logError("Promise was garbage collected; this should never happen!", e)
             }
-          })
+          }
         }
       }
     }