Skip to content

Commit fa24518

Browse files
committed
Fix Xpp3Dom#mergeIntoXpp3Dom to behave similar to Xpp3DomUtils#mergeIntoXpp3Dom
1 parent 4f333f2 commit fa24518

File tree

2 files changed

+5
-11
lines changed

2 files changed

+5
-11
lines changed

src/main/java/org/codehaus/plexus/util/xml/Xpp3Dom.java

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -435,12 +435,6 @@ private static void mergeIntoXpp3Dom( Xpp3Dom dominant, Xpp3Dom recessive, Boole
435435

436436
if ( mergeSelf )
437437
{
438-
if ( isEmpty( dominant.getValue() ) && !isEmpty( recessive.getValue() ) )
439-
{
440-
dominant.setValue( recessive.getValue() );
441-
dominant.setInputLocation( recessive.getInputLocation() );
442-
}
443-
444438
if ( recessive.attributes != null )
445439
{
446440
for ( String attr : recessive.attributes.keySet() )

src/test/java/org/codehaus/plexus/util/xml/Xpp3DomTest.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ public void testShouldPerformSelfOverrideAtTopLevel()
147147
* <p>testShouldMergeValuesAtTopLevelByDefault.</p>
148148
*/
149149
@Test
150-
public void testShouldMergeValuesAtTopLevelByDefault()
150+
public void testShouldNotMergeValuesAtTopLevelByDefault()
151151
{
152152
// create the dominant DOM
153153
Xpp3Dom t1 = new Xpp3Dom( "top" );
@@ -166,15 +166,15 @@ public void testShouldMergeValuesAtTopLevelByDefault()
166166
// this is still 2, since we're not using the merge-control attribute.
167167
assertEquals( 2, result.getAttributeNames().length );
168168

169-
assertEquals( result.getValue(), t2.getValue() );
170-
assertEquals( "t2top", result.getInputLocation() );
169+
assertNull( result.getValue() );
170+
assertEquals( "t1top", result.getInputLocation() );
171171
}
172172

173173
/**
174174
* <p>testShouldMergeValuesAtTopLevel.</p>
175175
*/
176176
@Test
177-
public void testShouldMergeValuesAtTopLevel()
177+
public void testShouldNotMergeValuesAtTopLevel()
178178
{
179179
// create the dominant DOM
180180
Xpp3Dom t1 = new Xpp3Dom( "top" );
@@ -191,7 +191,7 @@ public void testShouldMergeValuesAtTopLevel()
191191
Xpp3Dom result = Xpp3Dom.mergeXpp3Dom( t1, t2 );
192192

193193
assertEquals( 3, result.getAttributeNames().length );
194-
assertEquals( result.getValue(), t2.getValue() );
194+
assertNull( result.getValue() );
195195
}
196196

197197
/**

0 commit comments

Comments
 (0)