From 7e718cda265b85ad6337a0aa711906c7e1097e34 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Wed, 14 Oct 2015 16:32:58 +0100 Subject: [PATCH] Remove redundant hash from path of unpacked nested library Closes gh-4124 --- .../springframework/boot/loader/archive/JarFileArchive.java | 3 +-- .../boot/loader/archive/JarFileArchiveTests.java | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/archive/JarFileArchive.java b/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/archive/JarFileArchive.java index b31ebf59a50..b999fe1f725 100644 --- a/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/archive/JarFileArchive.java +++ b/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/archive/JarFileArchive.java @@ -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); } diff --git a/spring-boot-tools/spring-boot-loader/src/test/java/org/springframework/boot/loader/archive/JarFileArchiveTests.java b/spring-boot-tools/spring-boot-loader/src/test/java/org/springframework/boot/loader/archive/JarFileArchiveTests.java index 0f0994e532a..61373ff9788 100644 --- a/spring-boot-tools/spring-boot-loader/src/test/java/org/springframework/boot/loader/archive/JarFileArchiveTests.java +++ b/spring-boot-tools/spring-boot-loader/src/test/java/org/springframework/boot/loader/archive/JarFileArchiveTests.java @@ -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