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

Merge branch '1.4.x' into 1.5.x

This commit is contained in:
Stephane Nicoll 2016-11-29 08:02:50 +01:00
parent d0c3ece0ea d89cf94397
commit 06e44c71ec
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/archive/JarFileArchive.java Normal file → Executable file
View File

@ -219,7 +219,7 @@ public class JarFileArchive implements Archive {
@Override @Override
public String getName() { public String getName() {
return this.jarEntry.getName().toString(); return this.jarEntry.getName();
} }
} }

2
spring-boot-tools/spring-boot-loader/src/test/java/org/springframework/boot/loader/archive/JarFileArchiveTests.java Normal file → Executable file
View File

@ -123,7 +123,7 @@ public class JarFileArchiveTests {
private Map<String, Archive.Entry> getEntriesMap(Archive archive) { private Map<String, Archive.Entry> getEntriesMap(Archive archive) {
Map<String, Archive.Entry> entries = new HashMap<String, Archive.Entry>(); Map<String, Archive.Entry> entries = new HashMap<String, Archive.Entry>();
for (Archive.Entry entry : archive) { for (Archive.Entry entry : archive) {
entries.put(entry.getName().toString(), entry); entries.put(entry.getName(), entry);
} }
return entries; return entries;
} }