Changeset 9280 in josm for trunk/src/org/openstreetmap/josm/io

Timestamp:

2016-01-03T16:30:55+01:00 (8 years ago)

Author:

Don-vip

Message:

improve performance and simplify file copy operations (major performance gain when downloading geotools plugin)

File:

• trunk/src/org/openstreetmap/josm/io/CachedFile.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/io/CachedFile.java

@@ -5 +5 @@
 
 import java.io.BufferedInputStream;
-import java.io.BufferedOutputStream;
 import java.io.File;
 import java.io.FileInputStream;
-import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
-import java.io.OutputStream;
 import java.net.HttpURLConnection;
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.nio.file.StandardCopyOption;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -429 +428 @@
                 return localFile;
             }
-            try (
-                InputStream bis = new BufferedInputStream(con.getContent());
-                OutputStream fos = new FileOutputStream(destDirFile);
-                OutputStream bos = new BufferedOutputStream(fos)
-            ) {
-                byte[] buffer = new byte[4096];
-                int length;
-                while ((length = bis.read(buffer)) > -1) {
-                    bos.write(buffer, 0, length);
-                }
+            try (InputStream bis = new BufferedInputStream(con.getContent())) {
+                Files.copy(bis, destDirFile.toPath(), StandardCopyOption.REPLACE_EXISTING);
             }
             localFile = new File(destDir, localPath);