brett 2004/11/04 06:16:24
Modified: src/java/org/apache/maven Tag: MAVEN-1_0-BRANCH
MavenUtils.java
Log:
PR: MAVEN-1422
Submitted by: Eric Lapierre
Reviewed by: Brett Porter
don't evaluate expressions or parent contexts when integrating each new child
Revision Changes Path
No revision
No revision
1.107.4.27 +4 -4 maven/src/java/org/apache/maven/MavenUtils.java
Index: MavenUtils.java
===================================================================
RCS file: /home/cvs/maven/src/java/org/apache/maven/MavenUtils.java,v
retrieving revision 1.107.4.26
retrieving revision 1.107.4.27
diff -u -r1.107.4.26 -r1.107.4.27
--- MavenUtils.java 4 Nov 2004 13:35:10 -0000 1.107.4.26
+++ MavenUtils.java 4 Nov 2004 14:16:24 -0000 1.107.4.27
@@ -18,7 +18,6 @@
*/
import com.werken.forehead.ForeheadClassLoader;
-
import org.apache.commons.betwixt.XMLIntrospector;
import org.apache.commons.betwixt.io.BeanReader;
import org.apache.commons.betwixt.io.BeanWriter;
@@ -44,7 +43,6 @@
import javax.xml.parsers.ParserConfigurationException;
import javax.xml.parsers.SAXParserFactory;
-
import java.beans.IntrospectionException;
import java.io.ByteArrayOutputStream;
import java.io.File;
@@ -823,7 +821,9 @@
String key = (String) i.next();
Object value;
- if ( context.getVariable( key ) == null )
+ // Parent contexts are already handled, so only concern ourselves with
whether it exists in the current
+ // context
+ if ( context.getVariables().get( key ) == null )
{
value = map.get( key );
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
