From ba322807d2e5ed1ce69dae449238a1df16a74ae9 Mon Sep 17 00:00:00 2001
From: Andrew Or <andrewor14@gmail.com>
Date: Mon, 4 Aug 2014 17:00:31 -0700
Subject: [PATCH] Minor fixes

---
 core/src/main/scala/org/apache/spark/HttpServer.scala    | 4 +++-
 core/src/main/scala/org/apache/spark/ui/JettyUtils.scala | 4 ++--
 core/src/main/scala/org/apache/spark/util/Utils.scala    | 3 +--
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/core/src/main/scala/org/apache/spark/HttpServer.scala b/core/src/main/scala/org/apache/spark/HttpServer.scala
index 9ced0b87a5187..ee018ac390f6e 100644
--- a/core/src/main/scala/org/apache/spark/HttpServer.scala
+++ b/core/src/main/scala/org/apache/spark/HttpServer.scala
@@ -45,7 +45,9 @@ private[spark] class HttpServer(
     resourceBase: File,
     securityManager: SecurityManager,
     requestedPort: Int = 0,
-    serverName: String = "HTTP server") extends Logging {
+    serverName: String = "HTTP server")
+  extends Logging {
+
   private var server: Server = null
   private var port: Int = requestedPort
 
diff --git a/core/src/main/scala/org/apache/spark/ui/JettyUtils.scala b/core/src/main/scala/org/apache/spark/ui/JettyUtils.scala
index a4be870757250..a2535e3c1c41f 100644
--- a/core/src/main/scala/org/apache/spark/ui/JettyUtils.scala
+++ b/core/src/main/scala/org/apache/spark/ui/JettyUtils.scala
@@ -17,7 +17,7 @@
 
 package org.apache.spark.ui
 
-import java.net.{BindException, InetSocketAddress, URL}
+import java.net.{InetSocketAddress, URL}
 import javax.servlet.DispatcherType
 import javax.servlet.http.{HttpServlet, HttpServletRequest, HttpServletResponse}
 
@@ -33,7 +33,7 @@ import org.eclipse.jetty.util.thread.QueuedThreadPool
 import org.json4s.JValue
 import org.json4s.jackson.JsonMethods.{pretty, render}
 
-import org.apache.spark.{Logging, SecurityManager, SparkConf, SparkException}
+import org.apache.spark.{Logging, SecurityManager, SparkConf}
 import org.apache.spark.util.Utils
 
 /**
diff --git a/core/src/main/scala/org/apache/spark/util/Utils.scala b/core/src/main/scala/org/apache/spark/util/Utils.scala
index 042bc5b98fa0d..f955f5bc59422 100644
--- a/core/src/main/scala/org/apache/spark/util/Utils.scala
+++ b/core/src/main/scala/org/apache/spark/util/Utils.scala
@@ -1340,8 +1340,7 @@ private[spark] object Utils extends Logging {
    *                   A value of 3 means attempting ports n, n+1, n+2, and n+3, for example.
    * @param startService Function to start service on a given port.
    *                     This is expected to throw java.net.BindException on port collision.
-   * @throws SparkException When unable to start service in the given number of attempts
-   * @return
+   * @throws SparkException When unable to start the service after a given number of attempts
    */
   def startServiceOnPort[T](
       startPort: Int,