From b0352d04846e292de7371598705c71981cfd6d33 Mon Sep 17 00:00:00 2001 From: Peter Reilly Date: Mon, 25 Jun 2007 17:01:22 +0000 Subject: [PATCH] bugzilla 42735: filepath does not work anymore in git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@550549 13f79535-47bb-0310-9956-ffa450edef68 --- src/main/org/apache/tools/ant/taskdefs/Available.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/main/org/apache/tools/ant/taskdefs/Available.java b/src/main/org/apache/tools/ant/taskdefs/Available.java index 464416e9f..4bfd0efe3 100644 --- a/src/main/org/apache/tools/ant/taskdefs/Available.java +++ b/src/main/org/apache/tools/ant/taskdefs/Available.java @@ -323,12 +323,14 @@ public class Available extends Task implements Condition { } else { String[] paths = filepath.list(); 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]); // ** full-pathname 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) { log("Found: " + path, Project.MSG_VERBOSE); return true; @@ -365,6 +367,7 @@ public class Available extends Task implements Condition { return true; } } + // ** simple name specified == parent dir + name while (searchParents && parent != null && parent.exists()) { if (checkFile(new File(parent, filename),