summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdriaan Moors <adriaan.moors@typesafe.com>2013-03-11 22:49:45 -0700
committerAdriaan Moors <adriaan.moors@typesafe.com>2013-03-11 22:49:45 -0700
commit1374b7e71293bd5507bd88ea48b3a1c1971c6de0 (patch)
tree60431896b94994f57525c5d147f7695499c6e969
parent9eb21e54bdb1ea23b4215c641c98bd90a8b859cf (diff)
parenta67b62698d7a8768c6fb17af127f3061f59649f7 (diff)
downloadscala-1374b7e71293bd5507bd88ea48b3a1c1971c6de0.tar.gz
scala-1374b7e71293bd5507bd88ea48b3a1c1971c6de0.tar.bz2
scala-1374b7e71293bd5507bd88ea48b3a1c1971c6de0.zip
Merge pull request #2237 from som-snytt/topic/slurpee
Close after slurping (fixes SI-7244)
-rw-r--r--src/reflect/scala/reflect/io/Streamable.scala5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/reflect/scala/reflect/io/Streamable.scala b/src/reflect/scala/reflect/io/Streamable.scala
index 6184c6776a..1d51ad7f54 100644
--- a/src/reflect/scala/reflect/io/Streamable.scala
+++ b/src/reflect/scala/reflect/io/Streamable.scala
@@ -106,7 +106,10 @@ object Streamable {
/** Convenience function to import entire file into a String.
*/
def slurp(): String = slurp(creationCodec)
- def slurp(codec: Codec) = chars(codec).mkString
+ def slurp(codec: Codec) = {
+ val src = chars(codec)
+ try src.mkString finally src.close() // Always Be Closing
+ }
}
/** Call a function on something Closeable, finally closing it. */