Clean up

apache · Apr 8, 2014 · 7ef4628 · 7ef4628
1 parent 792d961
commit 7ef4628
Showing 1 changed file with 3 additions and 9 deletions.
diff --git a/core/src/main/scala/org/apache/spark/executor/ExecutorURLClassLoader.scala b/core/src/main/scala/org/apache/spark/executor/ExecutorURLClassLoader.scala
@@ -26,35 +26,29 @@ import java.net.{URLClassLoader, URL}
 
 private[spark] class ExecutorURLClassLoader(urls: Array[URL], parent: ClassLoader, userFirst: Boolean)
   extends ClassLoader {
-  class OverridenURLClassLoader(urls: Array[URL], parent: ClassLoader) extends URLClassLoader(urls, parent){
+
+  object userClassLoader extends URLClassLoader(urls, null){
     override def addURL(url: URL) {
       super.addURL(url)
     }
     override def findClass(name: String): Class[_] = { 
       super.findClass(name)
     }
   }
-  val userClassLoader = new OverridenURLClassLoader(urls, null)
 
-  class ParentClassLoader(myParent: ClassLoader) extends ClassLoader(parent) {
+  object parentClassLoader extends ClassLoader(parent) {
     override def findClass(name: String): Class[_] = {
-      println("parent class loader quest")
       super.findClass(name)
     }
   }
-  val parentClassLoader = new ParentClassLoader(parent)
 
   override def findClass(name: String): Class[_] = {
-    println("looking for "+name)
     if (!userFirst) {
       try {
-        println("loooking in parent")
         val c = parentClassLoader.findClass(name)
-        println("found in parent")
         c
       } catch {
         case e: ClassNotFoundException => {
-          println("could not find in parent")
           userClassLoader.findClass(name)
         }
       }