temp folder write bug fixed

robeio · Oct 21, 2015 · a905d39 · a905d39
1 parent 0c714f0
commit a905d39
Showing 1 changed file with 4 additions and 8 deletions.
diff --git a/robe-common/src/main/java/io/robe/common/utils/FileOperations.java b/robe-common/src/main/java/io/robe/common/utils/FileOperations.java
@@ -12,7 +12,7 @@
 public class FileOperations {
 
     public static final String JAVA_IO_TMP_DIR = "java.io.tmpdir";
-    public static final String TEMP_DIR = System.getProperty(JAVA_IO_TMP_DIR).toString();
+    public static final String TEMP_DIR = System.getProperty(JAVA_IO_TMP_DIR);
 
     private FileOperations() {
 
@@ -32,26 +32,22 @@ public static File writeToTemp(InputStream in) throws IOException {
         String tempName = UUID.randomUUID().toString().replaceAll("-", "");
 
         //Create new temp file under OS's temp folder with a random name
-        File tempFile = new File(System.getProperty(JAVA_IO_TMP_DIR) + tempName + ".tmp");
+        File tempFile = new File(TEMP_DIR, tempName + ".tmp");
         if (!tempFile.createNewFile()) {
             throw new IOException("Can not create temp file :" + tempFile.getParent());
         } else if (in == null) {
             return tempFile;
         }
         //Write file with a 1024 byte buffer.
-        FileOutputStream tempOS = new FileOutputStream(tempFile);
-        try {
+        try (FileOutputStream tempOS = new FileOutputStream(tempFile)) {
             byte[] buf = new byte[1024];
             int i = in.read(buf);
             while (i != -1) {
                 tempOS.write(buf, 0, i);
                 i = in.read(buf);
             }
         } finally {
-            if (in != null) {
-                in.close();
-            }
-            tempOS.close();
+            in.close();
         }
         return tempFile;
     }