Changeset 11856 in josm for trunk/src/org/openstreetmap

Timestamp:

2017-04-08T01:51:12+02:00 (7 years ago)

Author:

Don-vip

Message:

sonar - fb-contrib:IOI_DOUBLE_BUFFER_COPY - Performance - Method passes a Buffered Stream/Reader/Writer to a already buffering copy method

Location:

trunk/src/org/openstreetmap/josm

Files:

• gui/dialogs/MapPaintDialog.java (modified) (2 diffs)
• io/CachedFile.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java

@@ -15 +15 @@
 import java.awt.event.KeyEvent;
 import java.awt.event.MouseEvent;
-import java.io.BufferedInputStream;
 import java.io.BufferedReader;
 import java.io.File;
@@ -507 +506 @@
                         tr("Save style ''{0}'' as ''{1}''", s.getDisplayString(), file.getPath()));
                 try {
-                    InputStream in = s.getSourceInputStream();
-                    try (InputStream bis = new BufferedInputStream(in)) {
-                        Files.copy(bis, file.toPath(), StandardCopyOption.REPLACE_EXISTING);
-                    } finally {
-                        s.closeSourceInputStream(in);
+                    try (InputStream in = s.getSourceInputStream()) {
+                        Files.copy(in, file.toPath(), StandardCopyOption.REPLACE_EXISTING);
                     }
                 } catch (IOException e) {

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

@@ -4 +4 @@
 import static org.openstreetmap.josm.tools.I18n.tr;
 
-import java.io.BufferedInputStream;
 import java.io.BufferedReader;
 import java.io.ByteArrayOutputStream;
@@ -483 +482 @@
                 throw new IOException(tr("The requested URL {0} was not found", urlStr));
             }
-            try (InputStream bis = new BufferedInputStream(con.getContent())) {
-                Files.copy(bis, destDirFile.toPath(), StandardCopyOption.REPLACE_EXISTING);
+            try (InputStream is = con.getContent()) {
+                Files.copy(is, destDirFile.toPath(), StandardCopyOption.REPLACE_EXISTING);
             }
             activeConnection = null;