From 0db6799def3119b20798fc1b742e61db2d471dbf Mon Sep 17 00:00:00 2001 From: Phillip Webb Date: Tue, 30 Jul 2013 00:04:20 -0700 Subject: [PATCH] Polish spring-boot-loader-tools Issue: #53129653 --- .../org/springframework/boot/loader/tools/JarWriter.java | 9 ++++++--- .../springframework/boot/loader/tools/Repackager.java | 2 +- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/JarWriter.java b/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/JarWriter.java index 8636d2a474..26cf139e37 100644 --- a/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/JarWriter.java +++ b/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/JarWriter.java @@ -16,6 +16,7 @@ package org.springframework.boot.loader.tools; +import java.io.BufferedInputStream; import java.io.ByteArrayInputStream; import java.io.File; import java.io.FileInputStream; @@ -25,6 +26,7 @@ import java.io.FilterInputStream; import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; +import java.net.URL; import java.util.Arrays; import java.util.Enumeration; import java.util.HashSet; @@ -45,7 +47,7 @@ import java.util.zip.ZipEntry; */ class JarWriter { - private static final String NESTED_LOADER_JAR = "/META-INF/loader/spring-boot-loader.jar"; + private static final String NESTED_LOADER_JAR = "META-INF/loader/spring-boot-loader.jar"; private static final int BUFFER_SIZE = 4096; @@ -122,8 +124,9 @@ class JarWriter { * @throws IOException */ public void writeLoaderClasses() throws IOException { - JarInputStream inputStream = new JarInputStream(getClass().getResourceAsStream( - NESTED_LOADER_JAR)); + URL loaderJar = getClass().getClassLoader().getResource(NESTED_LOADER_JAR); + JarInputStream inputStream = new JarInputStream(new BufferedInputStream( + loaderJar.openStream())); JarEntry entry; while ((entry = inputStream.getNextJarEntry()) != null) { if (entry.getName().endsWith(".class")) { diff --git a/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/Repackager.java b/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/Repackager.java index 48a06589cb..6cbaa91e38 100644 --- a/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/Repackager.java +++ b/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/Repackager.java @@ -51,7 +51,7 @@ public class Repackager { /** * Sets the main class that should be run. If not specified the value from the - * MANIFEST will be used, or if no manifest entry is found a class the archive will be + * MANIFEST will be used, or if no manifest entry is found the archive will be * searched for a suitable class. * @param mainClass the main class name */