Merge branch '1.4.x' into 1.5.x

This commit is contained in:
Stephane Nicoll 2016-11-29 08:02:50 +01:00
commit 06e44c71ec
2 changed files with 2 additions and 2 deletions

View File

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

View File

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