From 04f501e77afd5aa909e1c117e84f7248c687293b Mon Sep 17 00:00:00 2001
From: Anthony Wat <acwwat@gmail.com>
Date: Wed, 23 Mar 2016 23:13:53 -0400
Subject: [PATCH] Preserve exit status on error in <ant>/<antcall>

---
 src/main/org/apache/tools/ant/ProjectHelper.java | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/main/org/apache/tools/ant/ProjectHelper.java b/src/main/org/apache/tools/ant/ProjectHelper.java
index c6eaa0774..ab3936827 100644
--- a/src/main/org/apache/tools/ant/ProjectHelper.java
+++ b/src/main/org/apache/tools/ant/ProjectHelper.java
@@ -562,6 +562,13 @@ public class ProjectHelper {
             + System.getProperty("line.separator")
             + ex.getLocation().toString()
             + ex.getMessage();
+        if (ex instanceof ExitStatusException) {
+            int exitStatus = ((ExitStatusException) ex).getStatus();
+            if (newLocation == null) {
+                return new ExitStatusException(errorMessage, exitStatus);
+            }
+            return new ExitStatusException(errorMessage, exitStatus, newLocation);
+        }
         if (newLocation == null) {
             return new BuildException(errorMessage, ex);
         }