Merge branch '1.5.x' into 2.0.x

This commit is contained in:
Phillip Webb
2018-08-30 15:59:02 -07:00
7 changed files with 63 additions and 60 deletions

View File

@@ -30,19 +30,16 @@ import java.util.zip.InflaterInputStream;
*/
class ZipInflaterInputStream extends InflaterInputStream {
private final Inflater inflater;
private int available;
private boolean extraBytesWritten;
private int available;
ZipInflaterInputStream(InputStream inputStream, int size) {
this(inputStream, new Inflater(true), size);
}
private ZipInflaterInputStream(InputStream inputStream, Inflater inflater, int size) {
super(inputStream, inflater, getInflaterBufferSize(size));
this.inflater = inflater;
super(inputStream, new Inflater(true), getInflaterBufferSize(size));
this.available = size;
}
@@ -66,7 +63,7 @@ class ZipInflaterInputStream extends InflaterInputStream {
@Override
public void close() throws IOException {
super.close();
this.inflater.end();
this.inf.end();
}
@Override