From 4e1ca8adac50b364f4c0fb7b760fbc35335add98 Mon Sep 17 00:00:00 2001
From: Peter Reilly <peterreilly@apache.org>
Date: Thu, 21 Oct 2004 10:31:06 +0000
Subject: [PATCH] ExecTask executes checkConfiguration() even though os does
 not match. PR: 31805 Obtained from: David Boon

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@276951 13f79535-47bb-0310-9956-ffa450edef68
---
 WHATSNEW                                           |  3 +++
 .../org/apache/tools/ant/taskdefs/ExecTask.java    | 14 ++++++++------
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/WHATSNEW b/WHATSNEW
index 0a897b3b3..ca2160ebc 100644
--- a/WHATSNEW
+++ b/WHATSNEW
@@ -124,6 +124,9 @@ Fixed bugs:
 * Execution of top level tasks in imported files get delayed by targets.
   Bugzilla report 31487.
 
+* ExecTask executes checkConfiguration() even though os does not match.
+  Bugzilla report 31805.
+
 Changes from Ant 1.6.1 to Ant 1.6.2
 ===================================
 
diff --git a/src/main/org/apache/tools/ant/taskdefs/ExecTask.java b/src/main/org/apache/tools/ant/taskdefs/ExecTask.java
index 963cbb8de..229d60dbc 100644
--- a/src/main/org/apache/tools/ant/taskdefs/ExecTask.java
+++ b/src/main/org/apache/tools/ant/taskdefs/ExecTask.java
@@ -455,15 +455,17 @@ public class ExecTask extends Task {
      * </ul>
      */
     public void execute() throws BuildException {
+        // Quick fail if this is not a valid OS for the command
+        if (!isValidOs()) {
+            return;
+        }
         File savedDir = dir; // possibly altered in prepareExec
         cmdl.setExecutable(resolveExecutable(executable, searchPath));
         checkConfiguration();
-        if (isValidOs()) {
-            try {
-                runExec(prepareExec());
-            } finally {
-                dir = savedDir;
-            }
+        try {
+            runExec(prepareExec());
+        } finally {
+            dir = savedDir;
         }
     }