Fix double creation of Manifest file

snicoll · Dec 14, 2023 · 5f7321a · 5f7321a
1 parent 0274eee
commit 5f7321a
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/...yertools/src/main/java/org/springframework/boot/jarmode/layertools/ExtractJarCommand.java b/...yertools/src/main/java/org/springframework/boot/jarmode/layertools/ExtractJarCommand.java
@@ -37,6 +37,7 @@
 import org.springframework.boot.jarmode.layertools.JarStructure.Entry;
 import org.springframework.util.Assert;
 import org.springframework.util.StreamUtils;
+import org.springframework.util.StringUtils;
 
 /**
  * Hacking.
@@ -89,11 +90,11 @@ protected void run(Map<Option, String> options, List<String> parameters) {
 							}
 							else {
 								JarEntry jarEntry = createJarEntry(resolvedEntry, zipEntry);
-								output.putNextEntry(jarEntry);
-								if (!zipEntry.isDirectory()) {
+								if (jarEntry != null) {
+									output.putNextEntry(jarEntry);
 									StreamUtils.copy(zip, output);
+									output.closeEntry();
 								}
-								output.closeEntry();
 							}
 						}
 						zipEntry = zip.getNextEntry();
@@ -144,6 +145,9 @@ private void write(ZipInputStream zip, ZipEntry entry, Path destination, String
 	}
 
 	private static JarEntry createJarEntry(Entry resolvedEntry, ZipEntry originalEntry) {
+		if (!StringUtils.hasLength(resolvedEntry.location())) {
+			return null;
+		}
 		JarEntry jarEntry = new JarEntry(resolvedEntry.location());
 		FileTime lastModifiedTime = originalEntry.getLastModifiedTime();
 		if (lastModifiedTime != null) {