ant-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From peterrei...@apache.org
Subject svn commit: r568511 - /ant/core/trunk/src/main/org/apache/tools/ant/PropertyHelper.java
Date Wed, 22 Aug 2007 08:42:12 GMT
Author: peterreilly
Date: Wed Aug 22 01:42:11 2007
New Revision: 568511

URL: http://svn.apache.org/viewvc?rev=568511&view=rev
Log:
allow a propertyevalulator to signal that it 'owns' the property, but the property is not
set

Modified:
    ant/core/trunk/src/main/org/apache/tools/ant/PropertyHelper.java

Modified: ant/core/trunk/src/main/org/apache/tools/ant/PropertyHelper.java
URL: http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/PropertyHelper.java?rev=568511&r1=568510&r2=568511&view=diff
==============================================================================
--- ant/core/trunk/src/main/org/apache/tools/ant/PropertyHelper.java (original)
+++ ant/core/trunk/src/main/org/apache/tools/ant/PropertyHelper.java Wed Aug 22 01:42:11 2007
@@ -28,6 +28,8 @@
 import java.util.Vector;
 import java.util.Enumeration;
 
+import org.apache.tools.ant.property.NullReturn;
+
 /* ISSUES:
  - ns param. It could be used to provide "namespaces" for properties, which
  may be more flexible.
@@ -784,6 +786,9 @@
         for (Iterator iter = getDelegates(PropertyEvaluator.class).iterator(); iter.hasNext();)
{
             Object o = ((PropertyEvaluator) iter.next()).evaluate(name, this);
             if (o != null) {
+                if (o instanceof NullReturn) {
+                    return null;
+                }
                 return o;
             }
         }



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@ant.apache.org
For additional commands, e-mail: dev-help@ant.apache.org


Mime
View raw message