diff options
| author | Lukas Rytz <lukas.rytz@typesafe.com> | 2015-10-05 10:27:44 +0200 |
|---|---|---|
| committer | Lukas Rytz <lukas.rytz@typesafe.com> | 2015-10-05 10:27:44 +0200 |
| commit | bb3ded3826adbb52b23725a93d6d51fc127b5623 (patch) | |
| tree | fa1683214211870acb50d8a578cdbc7d7de465f3 /src/compiler | |
| parent | ab4408e307d3010e62f877073a96e41239abc2ce (diff) | |
| parent | 80e4f5431c3c7efe3e13406b79a10ab9d274d460 (diff) | |
| download | scala-bb3ded3826adbb52b23725a93d6d51fc127b5623.tar.gz scala-bb3ded3826adbb52b23725a93d6d51fc127b5623.tar.bz2 scala-bb3ded3826adbb52b23725a93d6d51fc127b5623.zip | |
Merge pull request #4770 from SethTisue/windows-testing-fixes
get test suite passing on Windows
Diffstat (limited to 'src/compiler')
| -rw-r--r-- | src/compiler/scala/tools/nsc/Global.scala | 5 | ||||
| -rw-r--r-- | src/compiler/scala/tools/nsc/backend/jvm/analysis/ProdConsAnalyzer.scala | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/src/compiler/scala/tools/nsc/Global.scala b/src/compiler/scala/tools/nsc/Global.scala index 3469726455..936bed7c8f 100644 --- a/src/compiler/scala/tools/nsc/Global.scala +++ b/src/compiler/scala/tools/nsc/Global.scala @@ -1686,7 +1686,10 @@ class Global(var currentSettings: Settings, var reporter: Reporter) try { val stream = new FileOutputStream(file) printer.setWriter(new PrintWriter(stream, true)) - printer.printClass(cls) + try + printer.printClass(cls) + finally + stream.close() informProgress(s"wrote $file") } catch { case e: IOException => diff --git a/src/compiler/scala/tools/nsc/backend/jvm/analysis/ProdConsAnalyzer.scala b/src/compiler/scala/tools/nsc/backend/jvm/analysis/ProdConsAnalyzer.scala index 700b2f2f6c..594fd8923c 100644 --- a/src/compiler/scala/tools/nsc/backend/jvm/analysis/ProdConsAnalyzer.scala +++ b/src/compiler/scala/tools/nsc/backend/jvm/analysis/ProdConsAnalyzer.scala @@ -475,4 +475,4 @@ class InitialProducerSourceInterpreter extends SourceInterpreter { override def newExceptionValue(tryCatchBlockNode: TryCatchBlockNode, handlerFrame: Frame[_ <: Value], exceptionType: Type): SourceValue = { new SourceValue(1, ExceptionProducer(handlerFrame)) } -}
\ No newline at end of file +} |