Browse Source

ZIP-Entries always use forward slashes

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@273890 13f79535-47bb-0310-9956-ffa450edef68
master
Stefan Bodewig 22 years ago
parent
commit
9f7aebabbb
2 changed files with 3 additions and 2 deletions
  1. +3
    -0
      src/main/org/apache/tools/ant/types/ZipScanner.java
  2. +0
    -2
      src/testcases/org/apache/tools/ant/taskdefs/JarTest.java

+ 3
- 0
src/main/org/apache/tools/ant/types/ZipScanner.java View File

@@ -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)) {


+ 0
- 2
src/testcases/org/apache/tools/ant/taskdefs/JarTest.java View File

@@ -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


Loading…
Cancel
Save