From 04cad524fcd3faf6b809f8353027b7774fea1d17 Mon Sep 17 00:00:00 2001
From: "Jesse N. Glick" <jglick@apache.org>
Date: Thu, 27 Jul 2006 18:21:08 +0000
Subject: [PATCH] Actually permit validargs and defaultvalue together in the
 default handler. Formerly, would just prompt you again if you just pressed
 Enter.

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@426184 13f79535-47bb-0310-9956-ffa450edef68
---
 .../org/apache/tools/ant/input/MultipleChoiceInputRequest.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/org/apache/tools/ant/input/MultipleChoiceInputRequest.java b/src/main/org/apache/tools/ant/input/MultipleChoiceInputRequest.java
index a734da68e..031b89e19 100644
--- a/src/main/org/apache/tools/ant/input/MultipleChoiceInputRequest.java
+++ b/src/main/org/apache/tools/ant/input/MultipleChoiceInputRequest.java
@@ -51,6 +51,6 @@ public class MultipleChoiceInputRequest extends InputRequest {
      * @return true if the input is one of the allowed values.
      */
     public boolean isInputValid() {
-        return choices.contains(getInput());
+        return choices.contains(getInput()) || ("".equals(getInput()) && getDefaultValue() != null);
     }
 }