From a9c576b74204f899d6541ad0366a2e4535e2b30a Mon Sep 17 00:00:00 2001
From: Stefan Bodewig <bodewig@apache.org>
Date: Fri, 10 Jul 2009 15:02:08 +0000
Subject: [PATCH] make the executable attribute of apt inherited from javac
 work as expected.  PR 46230

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

diff --git a/WHATSNEW b/WHATSNEW
index 613972d17..4c4d57b7f 100644
--- a/WHATSNEW
+++ b/WHATSNEW
@@ -753,6 +753,10 @@ Other changes:
    directories which is desabled for backwards compatibility reasons.
    Bugzilla Report 47457
 
+ * <apt>'s executable attribute can be used to specify a different
+   executable.
+   Bugzilla Report 46230.
+
 Changes from Ant 1.7.0 TO Ant 1.7.1
 =============================================
 
diff --git a/src/main/org/apache/tools/ant/taskdefs/Apt.java b/src/main/org/apache/tools/ant/taskdefs/Apt.java
index 857fd0e66..241594e2a 100644
--- a/src/main/org/apache/tools/ant/taskdefs/Apt.java
+++ b/src/main/org/apache/tools/ant/taskdefs/Apt.java
@@ -119,7 +119,9 @@ public class Apt
      * @return the name of the executable.
      */
     public String getAptExecutable() {
-        return JavaEnvUtils.getJdkExecutable(EXECUTABLE_NAME);
+        String exe = getExecutable();
+        return exe != null ? exe :
+            JavaEnvUtils.getJdkExecutable(EXECUTABLE_NAME);
     }
 
     /**