diff options
author | Philipp Haller <hallerp@gmail.com> | 2009-01-29 11:33:23 +0000 |
---|---|---|
committer | Philipp Haller <hallerp@gmail.com> | 2009-01-29 11:33:23 +0000 |
commit | 91f5c1e98c81076684be9e0a1b03c45e321afe3c (patch) | |
tree | 228a9352008e2af0c2a96402d5e25631f1a68cad | |
parent | f13e298f14abd4def200900de5f5ed3c3819d3e9 (diff) | |
download | scala-91f5c1e98c81076684be9e0a1b03c45e321afe3c.tar.gz scala-91f5c1e98c81076684be9e0a1b03c45e321afe3c.tar.bz2 scala-91f5c1e98c81076684be9e0a1b03c45e321afe3c.zip |
Fixed lockup in partest.
-rw-r--r-- | src/partest/scala/tools/partest/nest/CompileManager.scala | 3 | ||||
-rw-r--r-- | src/partest/scala/tools/partest/nest/Worker.scala | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/src/partest/scala/tools/partest/nest/CompileManager.scala b/src/partest/scala/tools/partest/nest/CompileManager.scala index 2541ba2b56..f1fa7ccde2 100644 --- a/src/partest/scala/tools/partest/nest/CompileManager.scala +++ b/src/partest/scala/tools/partest/nest/CompileManager.scala @@ -115,6 +115,9 @@ class DirectCompiler(val fileManager: FileManager) extends SimpleCompiler { case e: Exception => e.printStackTrace() return false + case err: Error => + err.printStackTrace() + return false } finally { logWriter.close() } diff --git a/src/partest/scala/tools/partest/nest/Worker.scala b/src/partest/scala/tools/partest/nest/Worker.scala index 34dbdd7a3a..80fd3e0eba 100644 --- a/src/partest/scala/tools/partest/nest/Worker.scala +++ b/src/partest/scala/tools/partest/nest/Worker.scala @@ -862,7 +862,7 @@ class Worker(val fileManager: FileManager) extends Actor { t.printStackTrace if (t.getCause != null) t.getCause.printStackTrace - null + LogContext(null, None) } parent ! result } |