From 91f5c1e98c81076684be9e0a1b03c45e321afe3c Mon Sep 17 00:00:00 2001
From: Philipp Haller <hallerp@gmail.com>
Date: Thu, 29 Jan 2009 11:33:23 +0000
Subject: Fixed lockup in partest.

---
 src/partest/scala/tools/partest/nest/CompileManager.scala | 3 +++
 src/partest/scala/tools/partest/nest/Worker.scala         | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

(limited to 'src/partest')

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
       }
-- 
cgit v1.2.3