Skip to content

Commit 7cdfd98

Browse files
fit for new HttpServer constructor
1 parent 61a370d commit 7cdfd98

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

core/src/main/scala/org/apache/spark/broadcast/HttpBroadcast.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ private[broadcast] object HttpBroadcast extends Logging {
153153
private def createServer(conf: SparkConf) {
154154
broadcastDir = Utils.createTempDir(Utils.getLocalDir(conf))
155155
val broadcastPort = conf.getInt("spark.broadcast.port", 0)
156-
server = new HttpServer(broadcastDir, securityManager, broadcastPort, "HTTP broadcast server")
156+
server = new HttpServer(conf, broadcastDir, securityManager, broadcastPort, "HTTP broadcast server")
157157
server.start()
158158
serverUri = server.uri
159159
logInfo("Broadcast server started at " + serverUri)

repl/scala-2.10/src/main/scala/org/apache/spark/repl/SparkIMain.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ import org.apache.spark.util.Utils
106106
val virtualDirectory = new PlainFile(outputDir) // "directory" for classfiles
107107
/** Jetty server that will serve our classes to worker nodes */
108108
val classServerPort = conf.getInt("spark.replClassServer.port", 0)
109-
val classServer = new HttpServer(outputDir, new SecurityManager(conf), classServerPort, "HTTP class server")
109+
val classServer = new HttpServer(conf, outputDir, new SecurityManager(conf), classServerPort, "HTTP class server")
110110
private var currentSettings: Settings = initialSettings
111111
var printResults = true // whether to print result lines
112112
var totalSilence = false // whether to print anything

repl/scala-2.11/src/main/scala/org/apache/spark/repl/Main.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ object Main extends Logging {
3232
val s = new Settings()
3333
s.processArguments(List("-Yrepl-class-based",
3434
"-Yrepl-outdir", s"${outputDir.getAbsolutePath}", "-Yrepl-sync"), true)
35-
val classServer = new HttpServer(outputDir, new SecurityManager(conf))
35+
val classServer = new HttpServer(conf, outputDir, new SecurityManager(conf))
3636
var sparkContext: SparkContext = _
3737
var interp = new SparkILoop // this is a public var because tests reset it.
3838

0 commit comments

Comments
 (0)