Merge branch 'master' into scala-2.9

core/src/main/scala/spark/Executor.scala

@@ -4,6 +4,7 @@ import java.io.{File, FileOutputStream}
 import java.net.{URI, URL, URLClassLoader}
 import java.util.concurrent._
 
+import scala.actors.remote.RemoteActor
 import scala.collection.mutable.ArrayBuffer
 
 import mesos.{ExecutorArgs, ExecutorDriver, MesosExecutorDriver}
@@ -25,6 +26,9 @@ class Executor extends mesos.Executor with Logging {
     for ((key, value) <- props)
       System.setProperty(key, value)
 
+    // Make sure an appropriate class loader is set for remote actors
+    RemoteActor.classLoader = getClass.getClassLoader
+
     // Initialize Spark environment (using system properties read above)
     env = SparkEnv.createFromSystemProperties(false)
     SparkEnv.set(env)

core/src/main/scala/spark/SparkContext.scala

@@ -3,6 +3,7 @@ package spark
 import java.io._
 import java.util.concurrent.atomic.AtomicInteger
 
+import scala.actors.remote.RemoteActor
 import scala.collection.mutable.ArrayBuffer
 
 import org.apache.hadoop.mapred.InputFormat
@@ -37,6 +38,10 @@ extends Logging {
     System.setProperty("spark.master.host", Utils.localHostName)
   if (System.getProperty("spark.master.port") == null)
     System.setProperty("spark.master.port", "50501")
+
+  // Make sure a proper class loader is set for remote actors (unless user set one)
+  if (RemoteActor.classLoader == null)
+    RemoteActor.classLoader = getClass.getClassLoader
   
   // Create the Spark execution environment (cache, map output tracker, etc)
   val env = SparkEnv.createFromSystemProperties(true)