From 25065b118b929ec56e5cd06705e8f3283e9c9142 Mon Sep 17 00:00:00 2001
From: tjc <tjc@ee4ac58c-ac51-4696-9907-e4b3aa274f04>
Date: Thu, 22 Apr 2010 14:58:01 +0000
Subject: [PATCH] change containsEntry to be more flexible
git-svn-id: svn+ssh://svn.internal.sanger.ac.uk/repos/svn/pathsoft/artemis/trunk@13731 ee4ac58c-ac51-4696-9907-e4b3aa274f04
---
uk/ac/sanger/artemis/util/ZipFileDocument.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/uk/ac/sanger/artemis/util/ZipFileDocument.java b/uk/ac/sanger/artemis/util/ZipFileDocument.java
index 58f4b4f8d..cdd193935 100644
--- a/uk/ac/sanger/artemis/util/ZipFileDocument.java
+++ b/uk/ac/sanger/artemis/util/ZipFileDocument.java
@@ -97,10 +97,10 @@ public class ZipFileDocument extends FileDocument
while ((ze=zis.getNextEntry())!=null)
{
if( !ze.isDirectory() &&
- (ze.getName().equals(zipEntryName) || ze.getName().equals(zipEntryName+".gz")))
+ (ze.getName().equals(zipEntryName) || ze.getName().equals(zipEntryName+".gz") ||
+ ze.getName().endsWith("/"+zipEntryName) || ze.getName().endsWith("/"+zipEntryName+".gz")))
{
- if(ze.getName().equals(zipEntryName+".gz"))
- zipEntryName = ze.getName();
+ zipEntryName = ze.getName();
zis.close();
return true;
}
--
GitLab