Merge branch 'master' into new-rdds

core/src/main/scala/spark/BitTorrentBroadcast.scala

@@ -1079,6 +1079,9 @@ extends Logging {
   def initialize (isMaster__ : Boolean): Unit = {
     synchronized {
       if (!initialized) {
+        // Fix for issue #42
+        MasterHostAddress_ =
+          System.getProperty ("spark.broadcast.masterHostAddress", "")
         MasterTrackerPort_ = 
           System.getProperty ("spark.broadcast.masterTrackerPort", "11111").toInt
         BlockSize_ = 

core/src/main/scala/spark/ChainedBroadcast.scala

@@ -745,6 +745,9 @@ extends Logging {
   def initialize (isMaster__ : Boolean): Unit = {
     synchronized {
       if (!initialized) {
+        // Fix for issue #42
+        MasterHostAddress_ =
+          System.getProperty ("spark.broadcast.masterHostAddress", "")
         MasterTrackerPort_ = 
           System.getProperty ("spark.broadcast.masterTrackerPort", "22222").toInt
         BlockSize_ = 

core/src/main/scala/spark/MesosScheduler.scala

@@ -253,9 +253,11 @@ extends MScheduler with DAGScheduler with Logging
     // Copy each JAR to a unique filename in the jarDir
     for ((path, index) <- sc.jars.zipWithIndex) {
       val file = new File(path)
-      val filename = index + "_" + file.getName
-      copyFile(file, new File(jarDir, filename))
-      filenames += filename
+      if (file.exists) {
+        val filename = index + "_" + file.getName
+        copyFile(file, new File(jarDir, filename))
+        filenames += filename
+      }
     }
     // Create the server
     jarServer = new HttpServer(jarDir)