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/07/31 22:07:42 UTC

svn commit: r1614985 - in /commons/proper/configuration/trunk/src: main/java/org/apache/commons/configuration/XMLConfiguration.java test/java/org/apache/commons/configuration/TestXMLConfiguration.java

Author: oheger
Date: Thu Jul 31 20:07:42 2014
New Revision: 1614985

URL: http://svn.apache.org/r1614985
Log:
Removed calls to getRootNode() in XMLConfiguration and its test class.

Modified:
    commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/XMLConfiguration.java
    commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/TestXMLConfiguration.java

Modified: commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/XMLConfiguration.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/XMLConfiguration.java?rev=1614985&r1=1614984&r2=1614985&view=diff
==============================================================================
--- commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/XMLConfiguration.java (original)
+++ commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/XMLConfiguration.java Thu Jul 31 20:07:42 2014
@@ -256,8 +256,7 @@ public class XMLConfiguration extends Ba
     {
         super(c);
         rootElementName =
-                (c != null) ? c.getRootElementName() : getRootNode()
-                        .getNodeName();
+                (c != null) ? c.getRootElementName() : null;
         setLogger(LogFactory.getLog(XMLConfiguration.class));
     }
 
@@ -875,7 +874,8 @@ public class XMLConfiguration extends Ba
                 new XMLBuilderVisitor(newHelper, getListDelimiterHandler());
         builder.handleRemovedNodes(handler);
         builder.processDocument(handler);
-        initRootElementText(newHelper.getDocument(), getRootNode().getValue());
+        initRootElementText(newHelper.getDocument(), getModel()
+                .getNodeHandler().getRootNode().getValue());
         return newHelper.getDocument();
     }
 

Modified: commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/TestXMLConfiguration.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/TestXMLConfiguration.java?rev=1614985&r1=1614984&r2=1614985&view=diff
==============================================================================
--- commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/TestXMLConfiguration.java (original)
+++ commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/TestXMLConfiguration.java Thu Jul 31 20:07:42 2014
@@ -1239,7 +1239,8 @@ public class TestXMLConfiguration
     {
         XMLConfiguration c2 = new XMLConfiguration();
         load(c2, testProperties2);
-        conf.addNodes("copiedProperties", c2.getRootNode().getChildren());
+        conf.addNodes("copiedProperties", c2.getModel().getNodeHandler()
+                .getRootNode().getChildren());
         saveTestConfig();
         checkSavedConfig();
     }