luke
/
sbt
mirror of https://github.com/sbt/sbt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

shouldn't need to deserialize user classes when forking tests, only sbt+test-interface

This commit is contained in:
Mark Harrah 2013-06-28 11:02:49 -04:00
parent 53191cb787
commit 851451a90a
1 changed files with 1 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
main/actions/src/main/scala/sbt/ForkTests.scala
View File

@ -40,22 +40,7 @@ private[sbt] object ForkTests {
case _: java.net.SocketException => return
}
val os = new ObjectOutputStream(socket.getOutputStream)
// Make sure that ObjectInputStream use the passed in class loader
// ObjectInputStream class loading seems to be confusing, some old but useful links for reference:
// https://forums.oracle.com/thread/1151865
// http://sourceforge.net/p/jpype/bugs/52/
// http://tech-tauk.blogspot.com/2010/05/thread-context-classlaoder-in.html
val is = new ObjectInputStream(socket.getInputStream) {
override protected def resolveClass(desc: ObjectStreamClass): Class[_] = {
try {
val name = desc.getName
Class.forName(name, false, loader)
}
catch {
case e: ClassNotFoundException => super.resolveClass(desc)
}
}
}
val is = new ObjectInputStream(socket.getInputStream)
try {
os.writeBoolean(log.ansiCodesSupported)