Author: rgoers
Date: Fri Aug 27 23:16:00 2010
New Revision: 990297
URL: http://svn.apache.org/viewvc?rev=990297&view=rev
Log:
Apply patch for CONFIGURATION-423
Modified:
commons/proper/configuration/trunk/src/changes/changes.xml
commons/proper/configuration/trunk/src/test/org/apache/commons/configuration/reloading/TestFileChangedReloadingStrategy.java
Modified: commons/proper/configuration/trunk/src/changes/changes.xml
URL:
http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/changes/changes.xml?rev=990297&r1=990296&r2=990297&view=diff
==============================================================================
--- commons/proper/configuration/trunk/src/changes/changes.xml (original)
+++ commons/proper/configuration/trunk/src/changes/changes.xml Fri Aug 27
23:16:00 2010
@@ -23,6 +23,10 @@
<body>
<release version="1.7" date="in SVN" description="">
+ <action dev="rgoers" type="fix" issue="CONFIGURATION-423"
due-to="William Buckley">
+ testFromClassPath() can fail when it should not because of
inconsistent escaping of output from
+ PropertiesConfiguration.getURL() and
FileChangedReloadingStrategy.getFile().toURL().
+ </action>
<action dev="oheger" type="fix" issue="CONFIGURATION-418">
A bug related to the interpretation of escape sequences for backslashes
has been fixed. The user guide has also been improved in this area.
Modified:
commons/proper/configuration/trunk/src/test/org/apache/commons/configuration/reloading/TestFileChangedReloadingStrategy.java
URL:
http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/test/org/apache/commons/configuration/reloading/TestFileChangedReloadingStrategy.java?rev=990297&r1=990296&r2=990297&view=diff
==============================================================================
---
commons/proper/configuration/trunk/src/test/org/apache/commons/configuration/reloading/TestFileChangedReloadingStrategy.java
(original)
+++
commons/proper/configuration/trunk/src/test/org/apache/commons/configuration/reloading/TestFileChangedReloadingStrategy.java
Fri Aug 27 23:16:00 2010
@@ -128,7 +128,7 @@ public class TestFileChangedReloadingStr
assertTrue(config.getBoolean("configuration.loaded"));
FileChangedReloadingStrategy strategy = new
FileChangedReloadingStrategy();
config.setReloadingStrategy(strategy);
- assertEquals(config.getURL(), strategy.getFile().toURL());
+ assertEquals(config.getURL().toURI().toString(),
strategy.getFile().toURI().toString());
}
/**
