Browse Source

Polish

pull/5635/merge
Phillip Webb 10 years ago
parent
commit
5bc274ca09
  1. 2
      spring-boot-tools/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/Repackager.java
  2. 2
      spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/jar/JarFile.java

2
spring-boot-tools/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/Repackager.java

@ -189,6 +189,7 @@ public class Repackager { @@ -189,6 +189,7 @@ public class Repackager {
final List<Library> unpackLibraries = new ArrayList<Library>();
final List<Library> standardLibraries = new ArrayList<Library>();
libraries.doWithLibraries(new LibraryCallback() {
@Override
public void library(Library library) throws IOException {
File file = library.getFile();
@ -201,6 +202,7 @@ public class Repackager { @@ -201,6 +202,7 @@ public class Repackager {
}
}
}
});
writer.writeManifest(buildManifest(sourceJar));
Set<String> seen = new HashSet<String>();

2
spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/jar/JarFile.java

@ -259,6 +259,7 @@ public class JarFile extends java.util.jar.JarFile { @@ -259,6 +259,7 @@ public class JarFile extends java.util.jar.JarFile {
private JarFile createJarFileFromDirectoryEntry(JarEntry entry) throws IOException {
final AsciiBytes sourceName = new AsciiBytes(entry.getName());
JarEntryFilter filter = new JarEntryFilter() {
@Override
public AsciiBytes apply(AsciiBytes name) {
if (name.startsWith(sourceName) && !name.equals(sourceName)) {
@ -266,6 +267,7 @@ public class JarFile extends java.util.jar.JarFile { @@ -266,6 +267,7 @@ public class JarFile extends java.util.jar.JarFile {
}
return null;
}
};
return new JarFile(this.rootFile,
this.pathFromRoot + "!/"

Loading…
Cancel
Save