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 2013/08/06 21:15:21 UTC
svn commit: r1511077 -
/commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/ConfigurationUtils.java
Author: oheger
Date: Tue Aug 6 19:15:21 2013
New Revision: 1511077
URL: http://svn.apache.org/r1511077
Log:
Removed special treatment of Reloadable objects from ConfigurationUtils.
The Reloadable interface is no longer implemented by any Configuration class.
It is no longer needed after the reloading mechanism was rewritten.
Modified:
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/ConfigurationUtils.java
Modified: commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/ConfigurationUtils.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/ConfigurationUtils.java?rev=1511077&r1=1511076&r2=1511077&view=diff
==============================================================================
--- commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/ConfigurationUtils.java (original)
+++ commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/ConfigurationUtils.java Tue Aug 6 19:15:21 2013
@@ -32,7 +32,6 @@ import org.apache.commons.configuration.
import org.apache.commons.configuration.event.ConfigurationErrorListener;
import org.apache.commons.configuration.event.ConfigurationListener;
import org.apache.commons.configuration.event.EventSource;
-import org.apache.commons.configuration.reloading.Reloadable;
import org.apache.commons.configuration.sync.NoOpSynchronizer;
import org.apache.commons.configuration.sync.Synchronizer;
import org.apache.commons.configuration.tree.ExpressionEngine;
@@ -260,19 +259,7 @@ public final class ConfigurationUtils
if (conf instanceof HierarchicalConfiguration)
{
- HierarchicalConfiguration hc;
- if (conf instanceof Reloadable)
- {
- Object lock = ((Reloadable) conf).getReloadLock();
- synchronized (lock)
- {
- hc = new BaseHierarchicalConfiguration((HierarchicalConfiguration) conf);
- }
- }
- else
- {
- hc = (HierarchicalConfiguration) conf;
- }
+ HierarchicalConfiguration hc = (HierarchicalConfiguration) conf;
if (engine != null)
{
hc.setExpressionEngine(engine);