From 851451a90a3bb2ff95363fdafae921aa8cc3c500 Mon Sep 17 00:00:00 2001 From: Mark Harrah Date: Fri, 28 Jun 2013 11:02:49 -0400 Subject: [PATCH] shouldn't need to deserialize user classes when forking tests, only sbt+test-interface --- main/actions/src/main/scala/sbt/ForkTests.scala | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) diff --git a/main/actions/src/main/scala/sbt/ForkTests.scala b/main/actions/src/main/scala/sbt/ForkTests.scala index ac6c5e01b..0217f1422 100755 --- a/main/actions/src/main/scala/sbt/ForkTests.scala +++ b/main/actions/src/main/scala/sbt/ForkTests.scala @@ -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)