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/04/05 14:19:59 UTC
svn commit: r1464942 -
/commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/PropertiesConfiguration.java
Author: oheger
Date: Fri Apr 5 12:19:59 2013
New Revision: 1464942
URL: http://svn.apache.org/r1464942
Log:
Removed an if condition that was needed temporarily while reworking
PropertiesConfiguration.
Modified:
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/PropertiesConfiguration.java
Modified: commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/PropertiesConfiguration.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/PropertiesConfiguration.java?rev=1464942&r1=1464941&r2=1464942&view=diff
==============================================================================
--- commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/PropertiesConfiguration.java (original)
+++ commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/PropertiesConfiguration.java Fri Apr 5 12:19:59 2013
@@ -1412,32 +1412,28 @@ public class PropertiesConfiguration ext
*/
private void loadIncludeFile(String fileName) throws ConfigurationException
{
- // TODO remove when all tests are adapted
- URL url = null;
- if (locator != null)
+ assert locator != null : "Locator has not been set!";
+ URL url =
+ ConfigurationUtils.locate(locator.getFileSystem(),
+ locator.getBasePath(), fileName);
+ if (url == null)
{
- url =
- ConfigurationUtils.locate(locator.getFileSystem(),
- locator.getBasePath(), fileName);
- if (url == null)
+ URL baseURL = locator.getSourceURL();
+ if (baseURL != null)
{
- URL baseURL = locator.getSourceURL();
- if (baseURL != null)
- {
- url =
- ConfigurationUtils.locate(locator.getFileSystem(),
- baseURL.toString(), fileName);
- }
- }
-
- if (url == null)
- {
- throw new ConfigurationException("Cannot resolve include file "
- + fileName);
+ url =
+ ConfigurationUtils.locate(locator.getFileSystem(),
+ baseURL.toString(), fileName);
}
+ }
- FileHandler fh = new FileHandler(this);
- fh.load(url);
+ if (url == null)
+ {
+ throw new ConfigurationException("Cannot resolve include file "
+ + fileName);
}
+
+ FileHandler fh = new FileHandler(this);
+ fh.load(url);
}
}