From 24f4015568c96b92ab7d60b28da4b7c20b4e85f6 Mon Sep 17 00:00:00 2001
From: Stefan Bodewig <bodewig@apache.org>
Date: Fri, 21 Nov 2003 11:12:42 +0000
Subject: [PATCH] Make resolveExecutable method useful for subclasses

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@275659 13f79535-47bb-0310-9956-ffa450edef68
---
 .../org/apache/tools/ant/taskdefs/ExecTask.java    | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/main/org/apache/tools/ant/taskdefs/ExecTask.java b/src/main/org/apache/tools/ant/taskdefs/ExecTask.java
index d6a0f40d6..e08fdfcb2 100644
--- a/src/main/org/apache/tools/ant/taskdefs/ExecTask.java
+++ b/src/main/org/apache/tools/ant/taskdefs/ExecTask.java
@@ -363,14 +363,16 @@ public class ExecTask extends Task {
      * fallback to the straight executable name (i.e. on ther path)
      *
      * @return the executable as a full path if it can be determined.
+     *
+     * @since Ant 1.6
      */
-    private String resolveExecutable() {
+    protected String resolveExecutable(String exec) {
         if (!resolveExecutable) {
-            return executable;
+            return exec;
         }
 
         // try to find the executable
-        File executableFile = getProject().resolveFile(executable);
+        File executableFile = getProject().resolveFile(exec);
         if (executableFile.exists()) {
             return executableFile.getAbsolutePath();
         }
@@ -378,14 +380,14 @@ public class ExecTask extends Task {
         // now try to resolve against the dir if given
         if (dir != null) {
             FileUtils fileUtils = FileUtils.newFileUtils();
-            executableFile = fileUtils.resolveFile(dir, executable);
+            executableFile = fileUtils.resolveFile(dir, exec);
             if (executableFile.exists()) {
                 return executableFile.getAbsolutePath();
             }
         }
 
         // couldn't find it - must be on path
-        return executable;
+        return exec;
     }
 
     /**
@@ -400,7 +402,7 @@ public class ExecTask extends Task {
      */
     public void execute() throws BuildException {
         File savedDir = dir; // possibly altered in prepareExec
-        cmdl.setExecutable(resolveExecutable());
+        cmdl.setExecutable(resolveExecutable(executable));
         checkConfiguration();
         if (isValidOs()) {
             try {