You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by oh...@apache.org on 2014/04/20 21:20:16 UTC
svn commit: r1588822 -
/commons/proper/configuration/branches/immutableNodes/src/main/java/org/apache/commons/configuration/DynamicCombinedConfiguration.java
Author: oheger
Date: Sun Apr 20 19:20:16 2014
New Revision: 1588822
URL: http://svn.apache.org/r1588822
Log:
Adapted return type of clearTreeInternal().
Modified:
commons/proper/configuration/branches/immutableNodes/src/main/java/org/apache/commons/configuration/DynamicCombinedConfiguration.java
Modified: commons/proper/configuration/branches/immutableNodes/src/main/java/org/apache/commons/configuration/DynamicCombinedConfiguration.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/immutableNodes/src/main/java/org/apache/commons/configuration/DynamicCombinedConfiguration.java?rev=1588822&r1=1588821&r2=1588822&view=diff
==============================================================================
--- commons/proper/configuration/branches/immutableNodes/src/main/java/org/apache/commons/configuration/DynamicCombinedConfiguration.java (original)
+++ commons/proper/configuration/branches/immutableNodes/src/main/java/org/apache/commons/configuration/DynamicCombinedConfiguration.java Sun Apr 20 19:20:16 2014
@@ -34,7 +34,6 @@ import org.apache.commons.configuration.
import org.apache.commons.configuration.event.ConfigurationListener;
import org.apache.commons.configuration.interpol.ConfigurationInterpolator;
import org.apache.commons.configuration.interpol.Lookup;
-import org.apache.commons.configuration.tree.ConfigurationNode;
import org.apache.commons.configuration.tree.ExpressionEngine;
import org.apache.commons.configuration.tree.ImmutableNode;
import org.apache.commons.configuration.tree.NodeCombiner;
@@ -687,7 +686,7 @@ public class DynamicCombinedConfiguratio
}
@Override
- protected List<ConfigurationNode> clearTreeInternal(String key)
+ protected Object clearTreeInternal(String key)
{
this.getCurrentConfig().clearTree(key);
return Collections.emptyList();