mirror of
https://github.com/spring-projects/spring-boot.git
synced 2024-08-29 03:06:45 +08:00
Merge branch '1.2.x'
This commit is contained in:
commit
30f24eac0a
@ -114,12 +114,11 @@ public class JarFileArchive extends Archive {
|
||||
}
|
||||
|
||||
private Archive getUnpackedNestedArchive(JarEntryData data) throws IOException {
|
||||
AsciiBytes hash = data.getComment().substring(UNPACK_MARKER.length());
|
||||
String name = data.getName().toString();
|
||||
if (name.lastIndexOf("/") != -1) {
|
||||
name = name.substring(name.lastIndexOf("/") + 1);
|
||||
}
|
||||
File file = new File(getTempUnpackFolder(), hash.toString() + "-" + name);
|
||||
File file = new File(getTempUnpackFolder(), name);
|
||||
if (!file.exists() || file.length() != data.getSize()) {
|
||||
unpack(data, file);
|
||||
}
|
||||
|
@ -97,7 +97,7 @@ public class JarFileArchiveTests {
|
||||
Entry entry = getEntriesMap(this.archive).get("nested.jar");
|
||||
Archive nested = this.archive.getNestedArchive(entry);
|
||||
assertThat(nested.getUrl().toString(), startsWith("file:"));
|
||||
assertThat(nested.getUrl().toString(), endsWith(".jar"));
|
||||
assertThat(nested.getUrl().toString(), endsWith("/nested.jar"));
|
||||
}
|
||||
|
||||
@Test
|
||||
|
Loading…
Reference in New Issue
Block a user