You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@ant.apache.org by bo...@apache.org on 2005/09/09 23:00:31 UTC
svn commit: r279876 -
/ant/core/trunk/src/main/org/apache/tools/ant/types/PropertySet.java
Author: bodewig
Date: Fri Sep 9 14:00:28 2005
New Revision: 279876
URL: http://svn.apache.org/viewcvs?rev=279876&view=rev
Log:
use hashtable instead of getProperty which may return non-null even if the key is not in the hashtable. PR 36151
Modified:
ant/core/trunk/src/main/org/apache/tools/ant/types/PropertySet.java
Modified: ant/core/trunk/src/main/org/apache/tools/ant/types/PropertySet.java
URL: http://svn.apache.org/viewcvs/ant/core/trunk/src/main/org/apache/tools/ant/types/PropertySet.java?rev=279876&r1=279875&r2=279876&view=diff
==============================================================================
--- ant/core/trunk/src/main/org/apache/tools/ant/types/PropertySet.java (original)
+++ ant/core/trunk/src/main/org/apache/tools/ant/types/PropertySet.java Fri Sep 9 14:00:28 2005
@@ -338,13 +338,11 @@
* avoid needless duplication of the Hashtable during recursion.
*/
private void addPropertyNames(Set names, Hashtable properties) {
- Project prj = getProject();
-
// Add this PropertySet's property names.
for (Enumeration e = ptyRefs.elements(); e.hasMoreElements();) {
PropertyRef r = (PropertyRef) e.nextElement();
if (r.name != null) {
- if (prj != null && prj.getProperty(r.name) != null) {
+ if (properties.get(r.name) != null) {
names.add(r.name);
}
} else if (r.prefix != null) {
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@ant.apache.org
For additional commands, e-mail: dev-help@ant.apache.org