Merge pull request spring-projects#16620 from Christoph Dreis

* spring-projectsgh-16620: Optimize JarEntry construction Closes spring-projectsgh-16620
liuxuehai · Apr 23, 2019 · d0b4dab · d0b4dab
2 parents 2799018 + f40b086
commit d0b4dab
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/...-loader/src/main/java/org/springframework/boot/loader/jar/CentralDirectoryFileHeader.java b/...-loader/src/main/java/org/springframework/boot/loader/jar/CentralDirectoryFileHeader.java
@@ -153,6 +153,10 @@ public byte[] getExtra() {
 		return this.extra;
 	}
 
+	public boolean hasExtra() {
+		return this.extra.length > 0;
+	}
+
 	public AsciiBytes getComment() {
 		return this.comment;
 	}

diff --git a/...-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/jar/JarEntry.java b/...-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/jar/JarEntry.java
@@ -56,7 +56,9 @@ class JarEntry extends java.util.jar.JarEntry implements FileHeader {
 		setComment(header.getComment().toString());
 		setSize(header.getSize());
 		setTime(header.getTime());
-		setExtra(header.getExtra());
+		if (header.hasExtra()) {
+			setExtra(header.getExtra());
+		}
 	}
 
 	AsciiBytes getAsciiBytesName() {