root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 15 Packages Projects Releases Wiki Activity

Polish

This commit is contained in:
Phillip Webb 2016-04-12 13:21:31 -07:00
parent 0968d411e6
commit 5bc274ca09
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

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