From 77ed2ceec591f35d8056e41f48b8c9e0f9ce32c5 Mon Sep 17 00:00:00 2001
From: Stefan Bodewig <bodewig@apache.org>
Date: Mon, 8 Jan 2001 12:52:06 +0000
Subject: [PATCH] Changed <available> to resolve relative resource names the
 same way as <property> does.

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@268415 13f79535-47bb-0310-9956-ffa450edef68
---
 WHATSNEW                                              | 4 ++++
 src/main/org/apache/tools/ant/taskdefs/Available.java | 8 +++++++-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/WHATSNEW b/WHATSNEW
index cdba3e1f6..50ad97e0f 100644
--- a/WHATSNEW
+++ b/WHATSNEW
@@ -90,6 +90,10 @@ Fixed bugs:
 * nested <classpath> elements of <taskdef> now work for <taskdef>s not
   nested into <target> as well.
 
+* <property> and <available> will search for the resource /foo instead
+  of /org/apache/tools/ant/taskdefs/foo when given a relative resource
+  name foo.
+
 Changes from Ant 1.1 to Ant 1.2
 ===============================
 
diff --git a/src/main/org/apache/tools/ant/taskdefs/Available.java b/src/main/org/apache/tools/ant/taskdefs/Available.java
index acf51081c..727992798 100644
--- a/src/main/org/apache/tools/ant/taskdefs/Available.java
+++ b/src/main/org/apache/tools/ant/taskdefs/Available.java
@@ -144,7 +144,13 @@ public class Available extends Task {
         if (loader != null) {
             return (loader.getResourceAsStream(resource) != null);
         } else {
-            return (this.getClass().getResourceAsStream(resource) != null);
+            ClassLoader cL = this.getClass().getClassLoader();
+            if (cL != null) {
+                return (cL.getResourceAsStream(resource) != null);
+            } else {
+                return 
+                    (ClassLoader.getSystemResourceAsStream(resource) != null);
+            }
         }
     }