From 3c254f2eec87fbb9de4589816102245e01b0d42c Mon Sep 17 00:00:00 2001
From: Patrick Wendell <pwendell@gmail.com>
Date: Mon, 30 Dec 2013 23:55:33 -0800
Subject: [PATCH] Minor fixes
---
core/src/main/scala/org/apache/spark/HttpServer.scala | 2 +-
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
--
GitLab