Skip to content

Commit

Permalink
CR feedback
Browse files Browse the repository at this point in the history
  • Loading branch information
holdenk committed Apr 8, 2014
1 parent d4ae848 commit 7a7bf5f
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 17 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -291,7 +291,7 @@ private[spark] class Executor(
* Create a ClassLoader for use in tasks, adding any JARs specified by the user or any classes
* created by the interpreter to the search path
*/
private def createClassLoader(): AddableURLClassLoader = {
private def createClassLoader(): MutableURLClassLoader = {
val loader = this.getClass.getClassLoader

// For each of the jars in the jarSet, add them to the class loader.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,9 @@ private[spark] trait MutableURLClassLoader extends ClassLoader {
}

private[spark] class ChildExecutorURLClassLoader(urls: Array[URL], parent: ClassLoader)
extends ClassLoader with AddableURLClassLoader {
extends ClassLoader with MutableURLClassLoader {

private val userClassLoader = new URLClassLoader(urls, null){
private object userClassLoader extends URLClassLoader(urls, null){
override def addURL(url: URL) {
super.addURL(url)
}
Expand Down Expand Up @@ -65,7 +65,7 @@ private[spark] class ChildExecutorURLClassLoader(urls: Array[URL], parent: Class
}

private[spark] class ExecutorURLClassLoader(urls: Array[URL], parent: ClassLoader)
extends URLClassLoader(urls, parent) with AddableURLClassLoader {
extends URLClassLoader(urls, parent) with MutableURLClassLoader {

override def addURL(url: URL) {
super.addURL(url)
Expand Down
21 changes: 8 additions & 13 deletions core/src/main/scala/org/apache/spark/util/ParentClassLoader.scala
Original file line number Diff line number Diff line change
Expand Up @@ -15,23 +15,18 @@
* limitations under the License.
*/

package org.apache.spark.util;
package org.apache.spark.util

/**
* A class loader which makes findClass accesible to the child
*/
public class ParentClassLoader extends ClassLoader {
public ParentClassLoader(ClassLoader myParent) {
super(myParent);
}
private[spark] class ParentClassLoader(parent: ClassLoader) extends ClassLoader(parent) {

@Override
public Class<?> findClass(String name) throws ClassNotFoundException {
return super.findClass(name);
}
override def findClass(name: String) = {
super.findClass(name)
}

@Override
public Class<?> loadClass(String name) throws ClassNotFoundException {
return super.loadClass(name);
}
override def loadClass(name: String): Class[_] = {
super.loadClass(name)
}
}

0 comments on commit 7a7bf5f

Please sign in to comment.