From a99f8641768def160ff47a0e0deb40832d5f49c5 Mon Sep 17 00:00:00 2001
From: Peter Donald <donaldp@apache.org>
Date: Sun, 6 Jan 2002 02:01:29 +0000
Subject: [PATCH] No need to apply policy in task - can do that in context

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@270566 13f79535-47bb-0310-9956-ffa450edef68
---
 .../main/org/apache/tools/ant/taskdefs/Available.java    | 6 +-----
 .../src/main/org/apache/tools/ant/taskdefs/Input.java    | 9 +--------
 .../todo/org/apache/tools/ant/taskdefs/Available.java    | 6 +-----
 .../src/todo/org/apache/tools/ant/taskdefs/Input.java    | 9 +--------
 4 files changed, 4 insertions(+), 26 deletions(-)

diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Available.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Available.java
index a1bfe8c10..9987d0cc8 100644
--- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Available.java
+++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Available.java
@@ -165,11 +165,7 @@ public class Available
 
         if( eval() )
         {
-            if( null == getProject().getProperty( m_property ) )
-            {
-                setProperty( m_property, m_value );
-            }
-            //else ignore
+            setProperty( m_property, m_value );
         }
     }
 
diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Input.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Input.java
index 2429318b7..6f46d62d7 100644
--- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Input.java
+++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Input.java
@@ -142,14 +142,7 @@ public class Input extends Task
         // adopted from org.apache.tools.ant.taskdefs.Property
         if( addproperty != null )
         {
-            if( getProject().getProperty( addproperty ) == null )
-            {
-                setProperty( addproperty, input );
-            }
-            else
-            {
-                getLogger().debug( "Override ignored for " + addproperty );
-            }
+            setProperty( addproperty, input );
         }
     }
 }
diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Available.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Available.java
index a1bfe8c10..9987d0cc8 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Available.java
+++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Available.java
@@ -165,11 +165,7 @@ public class Available
 
         if( eval() )
         {
-            if( null == getProject().getProperty( m_property ) )
-            {
-                setProperty( m_property, m_value );
-            }
-            //else ignore
+            setProperty( m_property, m_value );
         }
     }
 
diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Input.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Input.java
index 2429318b7..6f46d62d7 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Input.java
+++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Input.java
@@ -142,14 +142,7 @@ public class Input extends Task
         // adopted from org.apache.tools.ant.taskdefs.Property
         if( addproperty != null )
         {
-            if( getProject().getProperty( addproperty ) == null )
-            {
-                setProperty( addproperty, input );
-            }
-            else
-            {
-                getLogger().debug( "Override ignored for " + addproperty );
-            }
+            setProperty( addproperty, input );
         }
     }
 }