You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@maven.apache.org by br...@apache.org on 2005/06/09 10:13:30 UTC
svn commit: r189732 -
/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
Author: brett
Date: Thu Jun 9 01:13:29 2005
New Revision: 189732
URL: http://svn.apache.org/viewcvs?rev=189732&view=rev
Log:
don't use cachedModel - it's null first time round, and we want to modify the current model.
Note that this modifies the cached version anyway.
Modified:
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
Modified: maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java?rev=189732&r1=189731&r2=189732&view=diff
==============================================================================
--- maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java (original)
+++ maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java Thu Jun 9 01:13:29 2005
@@ -294,7 +294,7 @@
{
Profile profile = (Profile) it.next();
- modelInheritanceAssembler.mergeProfileWithModel( cachedModel, profile );
+ modelInheritanceAssembler.mergeProfileWithModel( model, profile );
}
model = modelInterpolator.interpolate( model );
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
For additional commands, e-mail: dev-help@maven.apache.org