From f2c48218956a6331baea238c88027d243f7836c0 Mon Sep 17 00:00:00 2001 From: Mark Vainomaa Date: Sun, 26 Mar 2017 17:33:35 +0300 Subject: [PATCH] Fix stream reading... --- .../compressors/AbstractCompressor.java | 11 +++++------ .../algoritmidetest/compressors/CompressGZip.java | 7 +++++++ 2 files changed, 12 insertions(+), 6 deletions(-) create mode 100644 src/main/java/eu/mikroskeem/uurimustoo/algoritmidetest/compressors/CompressGZip.java diff --git a/src/main/java/eu/mikroskeem/uurimustoo/algoritmidetest/compressors/AbstractCompressor.java b/src/main/java/eu/mikroskeem/uurimustoo/algoritmidetest/compressors/AbstractCompressor.java index 12d9c21..53c6e35 100644 --- a/src/main/java/eu/mikroskeem/uurimustoo/algoritmidetest/compressors/AbstractCompressor.java +++ b/src/main/java/eu/mikroskeem/uurimustoo/algoritmidetest/compressors/AbstractCompressor.java @@ -1,7 +1,6 @@ package eu.mikroskeem.uurimustoo.algoritmidetest.compressors; import eu.mikroskeem.shuriken.common.SneakyThrow; -import org.tukaani.xz.FinishableOutputStream; import java.io.*; @@ -24,11 +23,11 @@ public abstract class AbstractCompressor { } public void pipe0(InputStream inputStream, OutputStream outputStream) throws IOException { - OutputStream out = pipe(outputStream); - byte[] buf = new byte[8192]; - int s; while((s = inputStream.read()) != -1) out.write(buf, 0, s); - if(out instanceof FinishableOutputStream) - ((FinishableOutputStream) out).finish(); + try(OutputStream out = pipe(outputStream)) { + byte[] buf = new byte[8192]; + int s; while ((s = inputStream.read(buf)) != -1) out.write(buf, 0, s); + out.flush(); + } } public abstract OutputStream pipe(OutputStream outputStream) throws IOException; diff --git a/src/main/java/eu/mikroskeem/uurimustoo/algoritmidetest/compressors/CompressGZip.java b/src/main/java/eu/mikroskeem/uurimustoo/algoritmidetest/compressors/CompressGZip.java new file mode 100644 index 0000000..f001c27 --- /dev/null +++ b/src/main/java/eu/mikroskeem/uurimustoo/algoritmidetest/compressors/CompressGZip.java @@ -0,0 +1,7 @@ +package eu.mikroskeem.uurimustoo.algoritmidetest.compressors; + +/** + * @author Mark Vainomaa + */ +public class CompressGZip { +}