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/14 22:07:55 UTC

svn commit: r1587300 - /commons/proper/configuration/branches/immutableNodes/src/main/java/org/apache/commons/configuration/BaseHierarchicalConfiguration.java

Author: oheger
Date: Mon Apr 14 20:07:55 2014
New Revision: 1587300

URL: http://svn.apache.org/r1587300
Log:
Simplified access to the root node of a configuration to be copied.

This is now possible in a safe way via the NodeModelSupport interface.

Modified:
    commons/proper/configuration/branches/immutableNodes/src/main/java/org/apache/commons/configuration/BaseHierarchicalConfiguration.java

Modified: commons/proper/configuration/branches/immutableNodes/src/main/java/org/apache/commons/configuration/BaseHierarchicalConfiguration.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/immutableNodes/src/main/java/org/apache/commons/configuration/BaseHierarchicalConfiguration.java?rev=1587300&r1=1587299&r2=1587300&view=diff
==============================================================================
--- commons/proper/configuration/branches/immutableNodes/src/main/java/org/apache/commons/configuration/BaseHierarchicalConfiguration.java (original)
+++ commons/proper/configuration/branches/immutableNodes/src/main/java/org/apache/commons/configuration/BaseHierarchicalConfiguration.java Mon Apr 14 20:07:55 2014
@@ -703,22 +703,7 @@ public class BaseHierarchicalConfigurati
     private static ImmutableNode obtainRootNode(
             HierarchicalConfiguration<ImmutableNode> c)
     {
-        boolean needSynchronization = c instanceof AbstractConfiguration;
-        if (needSynchronization)
-        {
-            ((AbstractConfiguration) c).beginRead(false);
-        }
-        try
-        {
-            return c.getRootNode();
-        }
-        finally
-        {
-            if (needSynchronization)
-            {
-                ((AbstractConfiguration) c).endRead();
-            }
-        }
+        return c.getNodeModel().getNodeHandler().getRootNode();
     }
 
     /**