Merge branch '1.5.x' into 2.0.x

Author: snicoll

spring-boot-project/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/jar/ZipInflaterInputStream.java

@@ -30,12 +30,19 @@
  */
 class ZipInflaterInputStream extends InflaterInputStream {
 
+	private final Inflater inflater;
+
 	private boolean extraBytesWritten;
 
 	private int available;
 
 	ZipInflaterInputStream(InputStream inputStream, int size) {
-		super(inputStream, new Inflater(true), getInflaterBufferSize(size));
+		this(inputStream, new Inflater(true), size);
+	}
+
+	private ZipInflaterInputStream(InputStream inputStream, Inflater inflater, int size) {
+		super(inputStream, inflater, getInflaterBufferSize(size));
+		this.inflater = inflater;
 		this.available = size;
 	}
 
@@ -56,6 +63,12 @@ public int read(byte[] b, int off, int len) throws IOException {
 		return result;
 	}
 
+	@Override
+	public void close() throws IOException {
+		super.close();
+		this.inflater.end();
+	}
+
 	@Override
 	protected void fill() throws IOException {
 		try {