Browse Source

bugzilla 42735: filepath does not work anymore in <available>

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@550549 13f79535-47bb-0310-9956-ffa450edef68
master
Peter Reilly 18 years ago
parent
commit
b0352d0484
1 changed files with 5 additions and 2 deletions
  1. +5
    -2
      src/main/org/apache/tools/ant/taskdefs/Available.java

+ 5
- 2
src/main/org/apache/tools/ant/taskdefs/Available.java View File

@@ -323,12 +323,14 @@ public class Available extends Task implements Condition {
} else { } else {
String[] paths = filepath.list(); String[] paths = filepath.list();
for (int i = 0; i < paths.length; ++i) { for (int i = 0; i < paths.length; ++i) {
log("Searching " + paths[i], Project.MSG_DEBUG);
log("Searching " + paths[i], Project.MSG_VERBOSE);
File path = new File(paths[i]); File path = new File(paths[i]);


// ** full-pathname specified == path in list // ** full-pathname specified == path in list
// ** simple name specified == path in list // ** simple name specified == path in list
if (path.exists() && filename.equals(paths[i])) {
if (path.exists() &&
(filename.equals(paths[i])
|| filename.equals(path.getName()))) {
if (type == null) { if (type == null) {
log("Found: " + path, Project.MSG_VERBOSE); log("Found: " + path, Project.MSG_VERBOSE);
return true; return true;
@@ -365,6 +367,7 @@ public class Available extends Task implements Condition {
return true; return true;
} }
} }

// ** simple name specified == parent dir + name // ** simple name specified == parent dir + name
while (searchParents && parent != null && parent.exists()) { while (searchParents && parent != null && parent.exists()) {
if (checkFile(new File(parent, filename), if (checkFile(new File(parent, filename),


Loading…
Cancel
Save