From 7249c2d45dd247abbf671d7628a2bf61e350b55e Mon Sep 17 00:00:00 2001 From: Jeroen Frijters Date: Sun, 12 Dec 2004 19:10:28 +0000 Subject: 2004-12-12 Jeroen Frijters * java/util/zip/ZipFile.java (getEntry): Fix to find dir entries without slash. * java/util/zip/ZipEntry.java (ZipEntry(ZipEntry,String)): New constructor to copy and change name. (ZipEntry(ZipEntry)): Delegate to new constructor. --- java/util/zip/ZipFile.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'java/util/zip/ZipFile.java') diff --git a/java/util/zip/ZipFile.java b/java/util/zip/ZipFile.java index 38ec9e6b5..b8773d578 100644 --- a/java/util/zip/ZipFile.java +++ b/java/util/zip/ZipFile.java @@ -358,7 +358,10 @@ public class ZipFile implements ZipConstants { HashMap entries = getEntries(); ZipEntry entry = (ZipEntry) entries.get(name); - return entry != null ? (ZipEntry) entry.clone() : null; + // If we didn't find it, maybe it's a directory. + if (entry == null && !name.endsWith("/")) + entry = (ZipEntry) entries.get(name + '/'); + return entry != null ? new ZipEntry(entry, name) : null; } catch (IOException ioe) { -- cgit v1.2.1