summaryrefslogtreecommitdiff
path: root/src/library
diff options
context:
space:
mode:
authorPaul Phillips <paulp@improving.org>2012-02-17 11:13:26 -0800
committerPaul Phillips <paulp@improving.org>2012-02-17 11:13:26 -0800
commit35b81d14778d2c6e8392ae51c53652f48b52b488 (patch)
tree7a51b75ac05953b73f652257871613254ee18a5f /src/library
parent1e648c386216d4c60121321a7ec40e2536bada9c (diff)
parent7de7f13d9d60a0cfc67f63a5fa9d6f79b6a9a392 (diff)
downloadscala-35b81d14778d2c6e8392ae51c53652f48b52b488.tar.gz
scala-35b81d14778d2c6e8392ae51c53652f48b52b488.tar.bz2
scala-35b81d14778d2c6e8392ae51c53652f48b52b488.zip
Merge branch 'develop'
Diffstat (limited to 'src/library')
-rw-r--r--src/library/scala/sys/process/BasicIO.scala5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/library/scala/sys/process/BasicIO.scala b/src/library/scala/sys/process/BasicIO.scala
index 5b7244e98e..edc60a1bb5 100644
--- a/src/library/scala/sys/process/BasicIO.scala
+++ b/src/library/scala/sys/process/BasicIO.scala
@@ -227,9 +227,10 @@ object BasicIO {
out.write(buffer, 0, byteCount)
// flush() will throw an exception once the process has terminated
val available = try { out.flush(); true } catch { case _: IOException => false }
- if (available) loop() else in.close()
- } else in.close()
+ if (available) loop()
+ }
}
loop()
+ in.close()
}
}