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

(-)src/main/org/apache/tools/ant/taskdefs/Ant.java (-3 / +8 lines)
Lines 35-40 Link Here
35
import org.apache.tools.ant.Project;
35
import org.apache.tools.ant.Project;
36
import org.apache.tools.ant.ProjectComponent;
36
import org.apache.tools.ant.ProjectComponent;
37
import org.apache.tools.ant.ProjectHelper;
37
import org.apache.tools.ant.ProjectHelper;
38
import org.apache.tools.ant.PropertyHelper;
38
import org.apache.tools.ant.Target;
39
import org.apache.tools.ant.Target;
39
import org.apache.tools.ant.Task;
40
import org.apache.tools.ant.Task;
40
import org.apache.tools.ant.MagicNames;
41
import org.apache.tools.ant.MagicNames;
Lines 638-647 Link Here
638
                    newProject.setNewProperty(key, value);
639
                    newProject.setNewProperty(key, value);
639
                }
640
                }
640
            } else if (type == PropertyType.USER) {
641
            } else if (type == PropertyType.USER) {
641
                newProject.setUserProperty(key, value);
642
            	if (!PropertyHelper.getPropertyHelper(this.getProject()).getInheritedProperties().containsKey(key)) {
643
            		newProject.setUserProperty(key, value);
644
            	}
642
            } else if (type == PropertyType.INHERITED) {
645
            } else if (type == PropertyType.INHERITED) {
643
                newProject.setInheritedProperty(key, value);
646
            	if (!PropertyHelper.getPropertyHelper(this.getProject()).getUserProperties().containsKey(key)) {
644
            }
647
            		newProject.setInheritedProperty(key, value);
648
            	}
649
            }            
645
        }
650
        }
646
    }
651
    }
647
652

Return to bug 49891