Update to follow the code style

Author: zsxwing

core/src/main/scala/org/apache/spark/broadcast/HttpBroadcast.scala

@@ -173,9 +173,8 @@ private[spark] object HttpBroadcast extends Logging {
       serOut.writeObject(value)
       serOut.close()
       files += file.getAbsolutePath
-    }
-    finally {
-      fileOutputStream.close
+    } finally {
+      fileOutputStream.close()
     }
   }
 

core/src/main/scala/org/apache/spark/deploy/SparkSubmitArguments.scala

@@ -327,17 +327,14 @@ object SparkSubmitArguments {
     val inputStream = new FileInputStream(file)
     try {
       val properties = new Properties()
-      try {
-        properties.load(inputStream)
-      } catch {
-        case e: IOException =>
-          val message = s"Failed when loading Spark properties file ${file.getName}"
-          throw new SparkException(message, e)
-      }
+      properties.load(inputStream)
       properties.stringPropertyNames().toSeq.map(k => (k, properties(k)))
-    }
-    finally {
-      inputStream.close
+    } catch {
+      case e: IOException =>
+        val message = s"Failed when loading Spark properties file ${file.getName}"
+        throw new SparkException(message, e)
+    } finally {
+      inputStream.close()
     }
   }
 }

core/src/main/scala/org/apache/spark/deploy/master/FileSystemPersistenceEngine.scala

@@ -85,8 +85,7 @@ private[spark] class FileSystemPersistenceEngine(
     val out = new FileOutputStream(file)
     try {
       out.write(serialized)
-    }
-    finally {
+    } finally {
       out.close()
     }
   }
@@ -96,8 +95,7 @@ private[spark] class FileSystemPersistenceEngine(
     val dis = new DataInputStream(new FileInputStream(file))
     try {
       dis.readFully(fileData)
-    }
-    finally {
+    } finally {
       dis.close()
     }
 

core/src/main/scala/org/apache/spark/storage/DiskStore.scala

@@ -79,10 +79,15 @@ private class DiskStore(blockManager: BlockManager, diskManager: DiskBlockManage
     val outputStream = new FileOutputStream(file)
     try {
       blockManager.dataSerializeStream(blockId, outputStream, values)
+      outputStream.close()
+    } catch {
+      case e: Throwable => {
+        outputStream.close()
+        if(file.exists()) file.delete()
+        throw e
+      }
     }
-    finally {
-      outputStream.close
-    }
+
     val length = file.length
 
     val timeTaken = System.currentTimeMillis - startTime