From 735315c1ea9b0870976be10f8f8ca4790383f1d1 Mon Sep 17 00:00:00 2001 From: Peter Reilly Date: Wed, 22 Aug 2007 08:42:11 +0000 Subject: [PATCH] allow a propertyevalulator to signal that it 'owns' the property, but the property is not set git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@568511 13f79535-47bb-0310-9956-ffa450edef68 --- src/main/org/apache/tools/ant/PropertyHelper.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/main/org/apache/tools/ant/PropertyHelper.java b/src/main/org/apache/tools/ant/PropertyHelper.java index dba01f407..38197b8df 100644 --- a/src/main/org/apache/tools/ant/PropertyHelper.java +++ b/src/main/org/apache/tools/ant/PropertyHelper.java @@ -28,6 +28,8 @@ import java.util.Set; 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 @@ public class PropertyHelper implements Cloneable { 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; } }