diff options
author | Philipp Haller <hallerp@gmail.com> | 2008-08-03 15:10:07 +0000 |
---|---|---|
committer | Philipp Haller <hallerp@gmail.com> | 2008-08-03 15:10:07 +0000 |
commit | 42f60f37e101a28c145fdc2dd854ea98d58fa49f (patch) | |
tree | 38773d9b991ba79bd4d3a932d30e78a7a7e6ac5b /src/partest | |
parent | 70f7bb2dc10a2ebd1f9a4e447be54a3b0f709673 (diff) | |
download | scala-42f60f37e101a28c145fdc2dd854ea98d58fa49f.tar.gz scala-42f60f37e101a28c145fdc2dd854ea98d58fa49f.tar.bz2 scala-42f60f37e101a28c145fdc2dd854ea98d58fa49f.zip |
Fixed problem with partest hanging when log fil...
Fixed problem with partest hanging when log file unreadable.
Diffstat (limited to 'src/partest')
-rw-r--r-- | src/partest/scala/tools/partest/nest/Worker.scala | 21 |
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+"\".") + } } } |