Changeset 9491 in josm for trunk

Timestamp:

2016-01-16T18:31:07+01:00 (9 years ago)

Author:

Don-vip

Message:

see #12356 - remove use of internal proprietary API (patch by michael2402)

File:

• trunk/test/performance/org/openstreetmap/josm/io/OsmReaderPerformanceTest.java (modified) (3 diffs)

trunk/test/performance/org/openstreetmap/josm/io/OsmReaderPerformanceTest.java

@@ -5 +5 @@
 
 import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
 import java.io.File;
 import java.io.FileInputStream;
@@ -18 +19 @@
 import org.openstreetmap.josm.PerformanceTestUtils.PerformanceTestTimer;
 import org.openstreetmap.josm.data.osm.DataSet;
-
-import sun.misc.IOUtils;
 
 /**
@@ -81 +80 @@
         File file = new File(DATA_FILE);
         try (InputStream is = decompressBeforeRead ? Compression.getUncompressedFileInputStream(file) : new FileInputStream(file)) {
-            return new ByteArrayInputStream(IOUtils.readFully(is, -1, false));
+            ByteArrayOutputStream temporary = new ByteArrayOutputStream();
+            byte[] readBuffer = new byte[4096];
+            int readBytes = 0;
+            while (readBytes != -1) {
+                temporary.write(readBuffer, 0, readBytes);
+                readBytes = is.read(readBuffer);
+            }
+            return new ByteArrayInputStream(temporary.toByteArray());
         }
     }