Attachment #30135 for bug #54769

View | Details | Raw Unified | Return to bug 54769
Collapse All | Expand All




     * @param props the properties to iterate over
     */
    protected void addProperties(Properties props) {
        for (Iterator it = props.keySet().iterator(); it.hasNext();) {
        resolveAllProperties(m);
        for (Iterator it = m.keySet().iterator(); it.hasNext();) {
            Object k = it.next();
            HashMap m = new HashMap();
            m.put(k, props.get(k));
            if (k instanceof String) {
                String propertyName = (String) k;
                resolveAllProperties(m);
                if (prefix != null) {
                    propertyName = prefix + propertyName;
                }

Return to bug 54769

Lines 666-677 Link Here

(-)src/main/org/apache/tools/ant/taskdefs/Property.java (-3 / +4 lines)
666	* @param props the properties to iterate over	666	* @param props the properties to iterate over
667	*/	667	*/
668	protected void addProperties(Properties props) {	668	protected void addProperties(Properties props) {
669	HashMap m = new HashMap(props);	669	for (Iterator it = props.keySet().iterator(); it.hasNext();) {
670	resolveAllProperties(m);
671	for (Iterator it = m.keySet().iterator(); it.hasNext();) {
672	Object k = it.next();	670	Object k = it.next();
		671	HashMap m = new HashMap();
		672	m.put(k, props.get(k));
673	if (k instanceof String) {	673	if (k instanceof String) {
674	String propertyName = (String) k;	674	String propertyName = (String) k;
		675	resolveAllProperties(m);
675	if (prefix != null) {	676	if (prefix != null) {
676	propertyName = prefix + propertyName;	677	propertyName = prefix + propertyName;
677	}	678	}