Ticket #12356: patch-remove-ioutils.patch

File patch-remove-ioutils.patch, 1.7 KB (added by michael2402, 8 years ago)
  • test/performance/org/openstreetmap/josm/io/OsmReaderPerformanceTest.java

    diff --git a/test/performance/org/openstreetmap/josm/io/OsmReaderPerformanceTest.java b/test/performance/org/openstreetmap/josm/io/OsmReaderPerformanceTest.java
    index b13c15d..384b1c8 100644
    a b package org.openstreetmap.josm.io;  
    44import static org.junit.Assert.assertNotNull;
    55
    66import java.io.ByteArrayInputStream;
     7import java.io.ByteArrayOutputStream;
    78import java.io.File;
    89import java.io.FileInputStream;
    910import java.io.IOException;
    import org.openstreetmap.josm.PerformanceTestUtils;  
    1819import org.openstreetmap.josm.PerformanceTestUtils.PerformanceTestTimer;
    1920import org.openstreetmap.josm.data.osm.DataSet;
    2021
    21 import sun.misc.IOUtils;
    22 
    2322/**
    2423 * This test tests how fast we are at reading an OSM file.
    2524 * <p>
    public class OsmReaderPerformanceTest {  
    8079    private InputStream loadFile(boolean decompressBeforeRead) throws IOException {
    8180        File file = new File(DATA_FILE);
    8281        try (InputStream is = decompressBeforeRead ? Compression.getUncompressedFileInputStream(file) : new FileInputStream(file)) {
    83             return new ByteArrayInputStream(IOUtils.readFully(is, -1, false));
     82            ByteArrayOutputStream temporary = new ByteArrayOutputStream();
     83            byte[] readBuffer = new byte[4096];
     84            int readBytes = 0;
     85            while (readBytes != -1) {
     86                temporary.write(readBuffer, 0, readBytes);
     87                readBytes = is.read(readBuffer);
     88            }
     89            return new ByteArrayInputStream(temporary.toByteArray());
    8490        }
    8591    }
    8692}