You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by pw...@apache.org on 2014/01/02 02:04:04 UTC
[4/9] git commit: Minor fixes
Minor fixes
Project: http://git-wip-us.apache.org/repos/asf/incubator-spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-spark/commit/3c254f2e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-spark/tree/3c254f2e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-spark/diff/3c254f2e
Branch: refs/heads/master
Commit: 3c254f2eec87fbb9de4589816102245e01b0d42c
Parents: 18181e6
Author: Patrick Wendell <pw...@gmail.com>
Authored: Mon Dec 30 23:55:33 2013 -0800
Committer: Patrick Wendell <pw...@gmail.com>
Committed: Mon Dec 30 23:55:33 2013 -0800
----------------------------------------------------------------------
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(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-spark/blob/3c254f2e/core/src/main/scala/org/apache/spark/HttpServer.scala
----------------------------------------------------------------------
diff --git a/core/src/main/scala/org/apache/spark/HttpServer.scala b/core/src/main/scala/org/apache/spark/HttpServer.scala
index 240f32e..69a738d 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)
http://git-wip-us.apache.org/repos/asf/incubator-spark/blob/3c254f2e/core/src/main/scala/org/apache/spark/Logging.scala
----------------------------------------------------------------------
diff --git a/core/src/main/scala/org/apache/spark/Logging.scala b/core/src/main/scala/org/apache/spark/Logging.scala
index 1fdbccd..6054adb 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