epugh 2004/09/16 14:35:58
Modified: configuration/xdocs changes.xml
configuration/src/test/org/apache/commons/configuration
TestPropertiesConfiguration.java
configuration/src/java/org/apache/commons/configuration
PropertiesConfiguration.java
BasePropertiesConfiguration.java
Log:
Better handling of .save() method for PropertiesConfiguration
Revision Changes Path
1.41 +3 -0 jakarta-commons/configuration/xdocs/changes.xml
Index: changes.xml
===================================================================
RCS file: /home/cvs/jakarta-commons/configuration/xdocs/changes.xml,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- changes.xml 6 Sep 2004 13:12:04 -0000 1.40
+++ changes.xml 16 Sep 2004 21:35:57 -0000 1.41
@@ -7,6 +7,9 @@
<body>
<release version="1.0-rc2" date="in CVS">
+ <action dev="epugh" type="fix">
+ PropertiesConfiguration.save() method has issues with preserving the
filename
+ </action>
<action dev="epugh" type="fix" issue="30597" due-to="Mark Woodman">
Test cases for HierarchicalConfigurationXMLReader stores comments as text
nodes
</action>
1.11 +17 -1
jakarta-commons/configuration/src/test/org/apache/commons/configuration/TestPropertiesConfiguration.java
Index: TestPropertiesConfiguration.java
===================================================================
RCS file:
/home/cvs/jakarta-commons/configuration/src/test/org/apache/commons/configuration/TestPropertiesConfiguration.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- TestPropertiesConfiguration.java 22 Jun 2004 11:23:47 -0000 1.10
+++ TestPropertiesConfiguration.java 16 Sep 2004 21:35:57 -0000 1.11
@@ -66,7 +66,23 @@
assertTrue("The saved configuration doesn't contain the key '" + key +
"'", checkConfig.containsKey(key));
assertEquals("Value of the '" + key + "' property",
conf.getProperty(key), checkConfig.getProperty(key));
}
+
+ // Save it again, verifing a save with a filename works.
+ checkConfig.save();
}
+
+ public void testSaveMissingFilename(){
+ PropertiesConfiguration pc = new PropertiesConfiguration();
+ try {
+ pc.save();
+ fail("Should have throw ConfigurationException");
+ }
+ catch (ConfigurationException ce){
+ //good
+ }
+ }
+
+
public void testLoadViaProperty() throws Exception
{
1.13 +2 -1
jakarta-commons/configuration/src/java/org/apache/commons/configuration/PropertiesConfiguration.java
Index: PropertiesConfiguration.java
===================================================================
RCS file:
/home/cvs/jakarta-commons/configuration/src/java/org/apache/commons/configuration/PropertiesConfiguration.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- PropertiesConfiguration.java 24 Jun 2004 14:01:03 -0000 1.12
+++ PropertiesConfiguration.java 16 Sep 2004 21:35:57 -0000 1.13
@@ -85,6 +85,7 @@
*/
public PropertiesConfiguration(String fileName) throws ConfigurationException
{
+ this.fileName = fileName;
load(fileName);
}
1.18 +4 -2
jakarta-commons/configuration/src/java/org/apache/commons/configuration/BasePropertiesConfiguration.java
Index: BasePropertiesConfiguration.java
===================================================================
RCS file:
/home/cvs/jakarta-commons/configuration/src/java/org/apache/commons/configuration/BasePropertiesConfiguration.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- BasePropertiesConfiguration.java 12 Aug 2004 15:30:36 -0000 1.17
+++ BasePropertiesConfiguration.java 16 Sep 2004 21:35:57 -0000 1.18
@@ -245,7 +245,9 @@
public void save(String filename) throws ConfigurationException
{
FileWriter writer = null;
-
+ if (filename==null){
+ throw new ConfigurationException("File name was not provided.");
+ }
try
{
writer = new FileWriter(filename);
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
