Commit 7e718cda authored by Andy Wilkinson's avatar Andy Wilkinson

Remove redundant hash from path of unpacked nested library

Closes gh-4124
parent d55c001a
......@@ -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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment