Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '1.5.x' into 2.0.x

Browse Source
This commit is contained in:
Andy Wilkinson
2018-06-19 20:06:44 +01:00
parent 864a6b3e91 6081db5c34
commit 814e90805e
2 changed files with 47 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
spring-boot-project/spring-boot-tools/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/JarWriter.java
View File

@@ -381,15 +381,15 @@ public class JarWriter implements LoaderClassesWriter, AutoCloseable {
public int read(byte[] b, int off, int len) throws IOException {
int read = (this.headerStream != null ? this.headerStream.read(b, off, len)
: -1);
if (read > 0) {
this.position += read;
}
else {
read = 0;
if (read <= 0) {
return readRemainder(b, off, len);
}
this.position += read;
if (read < len) {
read += super.read(b, off + read, len - read);
this.position += read;
int remainderRead = readRemainder(b, off + read, len - read);
if (remainderRead > 0) {
read += remainderRead;
}
}
if (this.position >= this.headerLength) {
this.headerStream = null;
@@ -401,6 +401,14 @@ public class JarWriter implements LoaderClassesWriter, AutoCloseable {
return Arrays.equals(this.header, ZIP_HEADER);
}
private int readRemainder(byte[] b, int off, int len) throws IOException {
int read = super.read(b, off, len);
if (read > 0) {
this.position += read;
}
return read;
}
}
/**