SPARK-1612: Fix potential resource leaks

xiliu82 · Apr 24, 2014 · 549ba13 · 549ba13
1 parent 1fdf659
commit 549ba13
Showing 1 changed file with 24 additions and 12 deletions.
diff --git a/core/src/main/scala/org/apache/spark/util/Utils.scala b/core/src/main/scala/org/apache/spark/util/Utils.scala
@@ -271,17 +271,25 @@ private[spark] object Utils extends Logging {
                  out: OutputStream,
                  closeStreams: Boolean = false)
   {
-    val buf = new Array[Byte](8192)
-    var n = 0
-    while (n != -1) {
-      n = in.read(buf)
-      if (n != -1) {
-        out.write(buf, 0, n)
+    try {
+      val buf = new Array[Byte](8192)
+      var n = 0
+      while (n != -1) {
+        n = in.read(buf)
+        if (n != -1) {
+          out.write(buf, 0, n)
+        }
       }
     }
-    if (closeStreams) {
-      in.close()
-      out.close()
+    finally {
+      if (closeStreams) {
+        try {
+          in.close()
+        }
+        finally {
+          out.close()
+        }
+      }
     }
   }
 
@@ -832,9 +840,13 @@ private[spark] object Utils extends Logging {
     val buff = new Array[Byte]((effectiveEnd-effectiveStart).toInt)
     val stream = new FileInputStream(file)
 
-    stream.skip(effectiveStart)
-    stream.read(buff)
-    stream.close()
+    try {
+      stream.skip(effectiveStart)
+      stream.read(buff)
+    }
+    finally {
+      stream.close()
+    }
     Source.fromBytes(buff).mkString
   }