Apache
/
maven
mirror of https://github.com/apache/maven.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

MNG-2813: Fix OutOfMemoryError when using profiles and pom inheritance 

Submitted by: Jochen Kuhnle


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@543373 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Jason van Zyl 2007-06-01 03:11:29 +00:00
parent f2f86285a3
commit 6cb79190cd
1 changed files with 21 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
maven-project/src/main/java/org/apache/maven/project/injection/DefaultProfileInjector.java
View File

@ -292,13 +292,31 @@ public class DefaultProfileInjector
} }
/**
* Merge two DOMs. Copy the dominant DOM so the original one is left unchanged.
* <p>
* Use this method instead of a direct call to {@link Xpp3Dom#mergeXpp3Dom(Xpp3Dom, Xpp3Dom)}.
* Profiles are dominant, thus they are merge targets, but they may be merged in several times
* (e.g. if they are inherited). So with the second merge, you don't get the profile's original
* DOM, but an already merged one.
*
* @param dominant Dominant DOM
* @param recessive Recessive DOM
* @return Merged DOM
*/
private Xpp3Dom merge( Xpp3Dom dominant, Xpp3Dom recessive )
{
Xpp3Dom dominantCopy = ( dominant == null ) ? null : new Xpp3Dom( dominant );
return Xpp3Dom.mergeXpp3Dom( dominantCopy, recessive );
}
private void injectConfigurationContainer( ConfigurationContainer profileContainer, private void injectConfigurationContainer( ConfigurationContainer profileContainer,
ConfigurationContainer modelContainer ) ConfigurationContainer modelContainer )
{ {
Xpp3Dom configuration = (Xpp3Dom) profileContainer.getConfiguration(); Xpp3Dom configuration = (Xpp3Dom) profileContainer.getConfiguration();
Xpp3Dom parentConfiguration = (Xpp3Dom) modelContainer.getConfiguration(); Xpp3Dom parentConfiguration = (Xpp3Dom) modelContainer.getConfiguration();
configuration = Xpp3Dom.mergeXpp3Dom( configuration, parentConfiguration ); configuration = merge( configuration, parentConfiguration );
modelContainer.setConfiguration( configuration ); modelContainer.setConfiguration( configuration );
} }
@ -504,7 +522,7 @@ public class DefaultProfileInjector
Xpp3Dom dominantConfig = (Xpp3Dom) dominant.getConfiguration(); Xpp3Dom dominantConfig = (Xpp3Dom) dominant.getConfiguration();
Xpp3Dom recessiveConfig = (Xpp3Dom) recessive.getConfiguration(); Xpp3Dom recessiveConfig = (Xpp3Dom) recessive.getConfiguration();
recessive.setConfiguration( Xpp3Dom.mergeXpp3Dom( dominantConfig, recessiveConfig ) ); recessive.setConfiguration( merge( dominantConfig, recessiveConfig ) );
Map mergedReportSets = new HashMap(); Map mergedReportSets = new HashMap();
@ -525,7 +543,7 @@ public class DefaultProfileInjector
Xpp3Dom dominantRSConfig = (Xpp3Dom) dominantReportSet.getConfiguration(); Xpp3Dom dominantRSConfig = (Xpp3Dom) dominantReportSet.getConfiguration();
Xpp3Dom mergedRSConfig = (Xpp3Dom) merged.getConfiguration(); Xpp3Dom mergedRSConfig = (Xpp3Dom) merged.getConfiguration();
merged.setConfiguration( Xpp3Dom.mergeXpp3Dom( dominantRSConfig, mergedRSConfig ) ); merged.setConfiguration( merge( dominantRSConfig, mergedRSConfig ) );
List mergedReports = merged.getReports(); List mergedReports = merged.getReports();