From 9f7aebabbb55c185ee746c6168b7f755bbdf0412 Mon Sep 17 00:00:00 2001 From: Stefan Bodewig Date: Mon, 27 Jan 2003 13:29:03 +0000 Subject: [PATCH] ZIP-Entries always use forward slashes git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@273890 13f79535-47bb-0310-9956-ffa450edef68 --- src/main/org/apache/tools/ant/types/ZipScanner.java | 3 +++ src/testcases/org/apache/tools/ant/taskdefs/JarTest.java | 2 -- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/main/org/apache/tools/ant/types/ZipScanner.java b/src/main/org/apache/tools/ant/types/ZipScanner.java index 79858127a..407d178ac 100644 --- a/src/main/org/apache/tools/ant/types/ZipScanner.java +++ b/src/main/org/apache/tools/ant/types/ZipScanner.java @@ -258,6 +258,9 @@ public class ZipScanner extends DirectoryScanner { return new Resource("", true, Long.MAX_VALUE, true); } + // Zip-Entries always use forward slashes + name = name.replace(File.separatorChar, '/'); + // first check if the archive needs to be scanned again scanme(); if (myentries.containsKey(name)) { diff --git a/src/testcases/org/apache/tools/ant/taskdefs/JarTest.java b/src/testcases/org/apache/tools/ant/taskdefs/JarTest.java index 76f532f02..180741194 100644 --- a/src/testcases/org/apache/tools/ant/taskdefs/JarTest.java +++ b/src/testcases/org/apache/tools/ant/taskdefs/JarTest.java @@ -110,7 +110,6 @@ public class JarTest extends BuildFileTest { File jarFile = new File(getProjectDir(), tempJar); long jarModifiedDate = jarFile.lastModified(); try { - // give Windows a chance Thread.currentThread().sleep(2500); } catch (InterruptedException e) { } // end of try-catch @@ -140,7 +139,6 @@ public class JarTest extends BuildFileTest { private void testRecreate(String firstTarget, String secondTarget) { executeTarget(firstTarget); try { - // give Windows a chance Thread.currentThread().sleep(2500); } catch (InterruptedException e) { } // end of try-catch