Fixed problem with partest hanging when log fil...

Fixed problem with partest hanging when log file unreadable.

1 files changed, 13 insertions, 8 deletions

diff --git a/src/partest/scala/tools/partest/nest/Worker.scala b/src/partest/scala/tools/partest/nest/Worker.scala
index 898d26108e..86df4abbde 100644
--- a/src/partest/scala/tools/partest/nest/Worker.scala
+++ b/src/partest/scala/tools/partest/nest/Worker.scala
@@ -712,13 +712,18 @@ class Worker(val fileManager: FileManager) extends Actor {
   }
 
   def showLog(logFile: File) {
-    val logReader = new BufferedReader(new FileReader(logFile))
-    val strWriter = new StringWriter
-    val logWriter = new PrintWriter(strWriter, true)
-    val logAppender = new StreamAppender(logReader, logWriter)
-    logAppender.run()
-    logReader.close()
-    val log = strWriter.toString
-    NestUI.normal(log)
+    try {
+      val logReader = new BufferedReader(new FileReader(logFile))
+      val strWriter = new StringWriter
+      val logWriter = new PrintWriter(strWriter, true)
+      val logAppender = new StreamAppender(logReader, logWriter)
+      logAppender.run()
+      logReader.close()
+      val log = strWriter.toString
+      NestUI.normal(log)
+    } catch {
+      case fnfe: java.io.FileNotFoundException =>
+        NestUI.failure("Couldn't open log file \""+logFile+"\".")
+    }
   }
 }