commit 746f45245087678ce6fb42c770037943da36eafd
author Stuart McCulloch <mcculls@gmail.com> Sun Jul 05 01:36:40 2015 +0100
committer Stuart McCulloch <mcculls@gmail.com> Sun Jul 05 01:36:40 2015 +0100
tree 3a8fcf1c4a133b7f4a623ed56ed5a15251c45718
parent b3c6c7edc253c2a373d408aafbf36433f9ede732

Bug 470781: only fall back to default-value if Plexus configuration has no value and no children

org.eclipse.sisu.plexus/src/org/codehaus/plexus/component/configurator/converters/AbstractConfigurationConverter.java

diff --git a/org.eclipse.sisu.plexus/src/org/codehaus/plexus/component/configurator/converters/AbstractConfigurationConverter.java b/org.eclipse.sisu.plexus/src/org/codehaus/plexus/component/configurator/converters/AbstractConfigurationConverter.java
index b02919c..f22f674 100644
--- a/org.eclipse.sisu.plexus/src/org/codehaus/plexus/component/configurator/converters/AbstractConfigurationConverter.java
+++ b/org.eclipse.sisu.plexus/src/org/codehaus/plexus/component/configurator/converters/AbstractConfigurationConverter.java
@@ -48,7 +48,7 @@
             {
                 result = evaluator.evaluate( value );
             }
-            if ( null == result )
+            if ( null == result && configuration.getChildCount() == 0 )
             {
                 value = configuration.getAttribute( "default-value" );
                 if ( null != value && value.length() > 0 )