From 6cb79190cdb8883b6330a621a2befbca05f43d75 Mon Sep 17 00:00:00 2001
From: Jason van Zyl <jvanzyl@apache.org>
Date: Fri, 1 Jun 2007 03:11:29 +0000
Subject: [PATCH] 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
---
 .../injection/DefaultProfileInjector.java     | 24 ++++++++++++++++---
 1 file changed, 21 insertions(+), 3 deletions(-)

diff --git a/maven-project/src/main/java/org/apache/maven/project/injection/DefaultProfileInjector.java b/maven-project/src/main/java/org/apache/maven/project/injection/DefaultProfileInjector.java
index 2337d6d69f..e8a41c3e24 100644
--- a/maven-project/src/main/java/org/apache/maven/project/injection/DefaultProfileInjector.java
+++ b/maven-project/src/main/java/org/apache/maven/project/injection/DefaultProfileInjector.java
@@ -291,6 +291,24 @@ 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,
                                                ConfigurationContainer modelContainer )
@@ -298,7 +316,7 @@ public class DefaultProfileInjector
         Xpp3Dom configuration = (Xpp3Dom) profileContainer.getConfiguration();
         Xpp3Dom parentConfiguration = (Xpp3Dom) modelContainer.getConfiguration();
 
-        configuration = Xpp3Dom.mergeXpp3Dom( configuration, parentConfiguration );
+        configuration = merge( configuration, parentConfiguration );
 
         modelContainer.setConfiguration( configuration );
     }
@@ -504,7 +522,7 @@ public class DefaultProfileInjector
         Xpp3Dom dominantConfig = (Xpp3Dom) dominant.getConfiguration();
         Xpp3Dom recessiveConfig = (Xpp3Dom) recessive.getConfiguration();
 
-        recessive.setConfiguration( Xpp3Dom.mergeXpp3Dom( dominantConfig, recessiveConfig ) );
+        recessive.setConfiguration( merge( dominantConfig, recessiveConfig ) );
 
         Map mergedReportSets = new HashMap();
 
@@ -525,7 +543,7 @@ public class DefaultProfileInjector
                 Xpp3Dom dominantRSConfig = (Xpp3Dom) dominantReportSet.getConfiguration();
                 Xpp3Dom mergedRSConfig = (Xpp3Dom) merged.getConfiguration();
 
-                merged.setConfiguration( Xpp3Dom.mergeXpp3Dom( dominantRSConfig, mergedRSConfig ) );
+                merged.setConfiguration( merge( dominantRSConfig, mergedRSConfig ) );
 
                 List mergedReports = merged.getReports();