From 96f9f0ceb4f64b75acead81c323ca029a681b4a6 Mon Sep 17 00:00:00 2001
From: Conor MacNeill <conor@apache.org>
Date: Sat, 2 Feb 2002 12:52:01 +0000
Subject: [PATCH] Since Project.getProperties now returns a cloned hashtable,
 should avoid using it for property replacement.

Project.replaceProperties now passes its properties map to ProjectHelper's
main replaceProperties method rather than calling the simple version which
just called back to project.getProperties().

The simple version in ProjectHelper now calls Project.replaceProperties
rather than calling Project.getProperties.


git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@271073 13f79535-47bb-0310-9956-ffa450edef68
---
 src/main/org/apache/tools/ant/Project.java           | 2 +-
 src/main/org/apache/tools/ant/ProjectHelper.java     | 2 +-
 src/main/org/apache/tools/ant/taskdefs/LoadFile.java | 3 +--
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/main/org/apache/tools/ant/Project.java b/src/main/org/apache/tools/ant/Project.java
index 724b2d3c2..15113bc62 100644
--- a/src/main/org/apache/tools/ant/Project.java
+++ b/src/main/org/apache/tools/ant/Project.java
@@ -381,7 +381,7 @@ public class Project {
      */
     public String replaceProperties(String value)
         throws BuildException { 
-        return ProjectHelper.replaceProperties(this, value);
+        return ProjectHelper.replaceProperties(this, value, properties);
     }
 
     /**
diff --git a/src/main/org/apache/tools/ant/ProjectHelper.java b/src/main/org/apache/tools/ant/ProjectHelper.java
index 76abb8476..f5022e02c 100644
--- a/src/main/org/apache/tools/ant/ProjectHelper.java
+++ b/src/main/org/apache/tools/ant/ProjectHelper.java
@@ -737,7 +737,7 @@ public class ProjectHelper {
      */
      public static String replaceProperties(Project project, String value)
             throws BuildException {
-         return replaceProperties(project,value,project.getProperties());
+         return project.replaceProperties(value);
      }
 
     /**
diff --git a/src/main/org/apache/tools/ant/taskdefs/LoadFile.java b/src/main/org/apache/tools/ant/taskdefs/LoadFile.java
index f78b3157b..e17b8a973 100644
--- a/src/main/org/apache/tools/ant/taskdefs/LoadFile.java
+++ b/src/main/org/apache/tools/ant/taskdefs/LoadFile.java
@@ -56,7 +56,6 @@ package org.apache.tools.ant.taskdefs;
 import org.apache.tools.ant.Task;
 import org.apache.tools.ant.Project;
 import org.apache.tools.ant.BuildException;
-import org.apache.tools.ant.ProjectHelper;
 
 
 import java.io.*;
@@ -205,7 +204,7 @@ public class LoadFile extends Task {
                 text=stripLineBreaks(text);
             }
             if(evaluateProperties) {
-                text=ProjectHelper.replaceProperties(project,text);
+                text = project.replaceProperties(text);
             }
             project.setNewProperty(property, text);
             log("loaded "+buffer.length+" characters",Project.MSG_VERBOSE);