Skip to content
Closed
Changes from 1 commit
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
e1d9f71
One loader workers.
holdenk Mar 21, 2014
648b559
Both class loaders compile. Now for testing
holdenk Mar 21, 2014
8d2241e
Adda FakeClass for testing ClassLoader precedence options
holdenk Mar 21, 2014
16aecd1
Doesn't quite work
holdenk Mar 21, 2014
792d961
Almost works
holdenk Mar 22, 2014
7ef4628
Clean up
holdenk Mar 23, 2014
22d83cb
Add a test suite for the executor url class loader suite
holdenk Mar 23, 2014
47046ff
Remove bad import'
holdenk Mar 23, 2014
dc4fe44
Does not depend on being in my home directory
holdenk Mar 23, 2014
691ee00
It works ish
holdenk Mar 23, 2014
9e2d236
It works comrade
holdenk Mar 23, 2014
8a67302
Test are good
holdenk Mar 23, 2014
4919bf9
Fix parent calling class loader issue
holdenk Mar 24, 2014
d90d217
Fix fall back with custom class loader and add a test for it
holdenk Mar 24, 2014
a343350
Update rat-excludes and remove a useless file
holdenk Mar 25, 2014
241b03d
fix my rat excludes
holdenk Mar 25, 2014
bb8d179
Fix issues with the repl class loader
holdenk Mar 25, 2014
125ea7f
Easier to just remove those files, we don't need them
holdenk Mar 25, 2014
a0ef85a
Fix style issues
holdenk Mar 25, 2014
7752594
re-add https comment
holdenk Mar 25, 2014
aa95083
CR feedback
holdenk Mar 25, 2014
d4ae848
rewrite component into scala
holdenk Mar 25, 2014
7a7bf5f
CR feedback
holdenk Mar 25, 2014
261aaee
simplify executorurlclassloader a bit
holdenk Mar 25, 2014
858aba2
Remove a bunch of test junk
holdenk Apr 8, 2014
9f68f10
Start rewriting the ExecutorURLClassLoaderSuite to not use the hard c…
holdenk Apr 8, 2014
204b199
Fix the generated classes
holdenk Apr 8, 2014
f0b7114
Fix the core/src/test/scala/org/apache/spark/executor/ExecutorURLClas…
holdenk Apr 8, 2014
644719f
User the class generator for the repl class loader tests too
holdenk Apr 8, 2014
7546549
CR feedback, merge some of the testutils methods down, rename the cla…
holdenk Apr 8, 2014
8f89965
Fix tests for new class name
holdenk Apr 8, 2014
1955232
Fix long line in TestUtils
holdenk Apr 8, 2014
cf0cac9
Fix the executorclassloader
holdenk Apr 8, 2014
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Clean up
  • Loading branch information
holdenk committed Apr 8, 2014
commit 7ef4628184c8bce2fbb87cd1d589aa666abc15bb
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}
}
Expand Down