diff options
| author | Patrick Wendell <pwendell@gmail.com> | 2013-12-30 23:55:33 -0800 |
|---|---|---|
| committer | Patrick Wendell <pwendell@gmail.com> | 2013-12-30 23:55:33 -0800 |
| commit | 3c254f2eec87fbb9de4589816102245e01b0d42c (patch) | |
| tree | 9552c4d87c78ea4d8f9555f5e6c93b9fc49fc888 /core | |
| parent | 18181e6c4120b04d125aa99a1ac63e5e7b2c0e3d (diff) | |
| download | spark-3c254f2eec87fbb9de4589816102245e01b0d42c.tar.gz spark-3c254f2eec87fbb9de4589816102245e01b0d42c.tar.bz2 spark-3c254f2eec87fbb9de4589816102245e01b0d42c.zip | |
Minor fixes
Diffstat (limited to 'core')
| -rw-r--r-- | core/src/main/scala/org/apache/spark/HttpServer.scala | 2 | ||||
| -rw-r--r-- | core/src/main/scala/org/apache/spark/Logging.scala | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/core/src/main/scala/org/apache/spark/HttpServer.scala b/core/src/main/scala/org/apache/spark/HttpServer.scala index 240f32efaf..69a738dc44 100644 --- a/core/src/main/scala/org/apache/spark/HttpServer.scala +++ b/core/src/main/scala/org/apache/spark/HttpServer.scala @@ -46,7 +46,7 @@ private[spark] class HttpServer(resourceBase: File) extends Logging { if (server != null) { throw new ServerStateException("Server is already started") } else { - log.info("Starting HTTP Server") + logInfo("Starting HTTP Server") server = new Server() val connector = new SocketConnector connector.setMaxIdleTime(60*1000) diff --git a/core/src/main/scala/org/apache/spark/Logging.scala b/core/src/main/scala/org/apache/spark/Logging.scala index 1fdbccdec6..6054adb52e 100644 --- a/core/src/main/scala/org/apache/spark/Logging.scala +++ b/core/src/main/scala/org/apache/spark/Logging.scala @@ -119,6 +119,6 @@ trait Logging { } object Logging { - @transient @volatile private var initialized = false - @transient val initLock = new Object() + @volatile private var initialized = false + val initLock = new Object() }
\ No newline at end of file |