oheger 2005/01/15 07:29:30
Modified: configuration/src/test/org/apache/commons/configuration
TestFileConfiguration.java
configuration/src/java/org/apache/commons/configuration
AbstractFileConfiguration.java
Log:
Slightly improved exception handling
Revision Changes Path
1.4 +28 -1
jakarta-commons/configuration/src/test/org/apache/commons/configuration/TestFileConfiguration.java
Index: TestFileConfiguration.java
===================================================================
RCS file:
/home/cvs/jakarta-commons/configuration/src/test/org/apache/commons/configuration/TestFileConfiguration.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- TestFileConfiguration.java 4 Dec 2004 15:45:39 -0000 1.3
+++ TestFileConfiguration.java 15 Jan 2005 15:29:30 -0000 1.4
@@ -166,4 +166,31 @@
}
}
}
+
+ /**
+ * Tests if invalid URLs cause an exception.
+ */
+ public void testSaveInvalidURL() throws Exception
+ {
+ FileConfiguration config = new PropertiesConfiguration();
+ try
+ {
+ config.save(new URL("http://jakarta.apache.org";));
+ fail("Should throw a ConfigurationException!");
+ }
+ catch (ConfigurationException cex)
+ {
+ //fine
+ }
+
+ try
+ {
+ config.save("http://www.apache.org";);
+ fail("Should throw a ConfigurationException!");
+ }
+ catch (ConfigurationException cex)
+ {
+ //fine
+ }
+ }
}
1.14 +9 -1
jakarta-commons/configuration/src/java/org/apache/commons/configuration/AbstractFileConfiguration.java
Index: AbstractFileConfiguration.java
===================================================================
RCS file:
/home/cvs/jakarta-commons/configuration/src/java/org/apache/commons/configuration/AbstractFileConfiguration.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- AbstractFileConfiguration.java 3 Jan 2005 12:42:30 -0000 1.13
+++ AbstractFileConfiguration.java 15 Jan 2005 15:29:30 -0000 1.14
@@ -164,6 +164,10 @@
try
{
URL url = ConfigurationUtils.locate(basePath, fileName);
+ if (url == null)
+ {
+ throw new ConfigurationException("Cannot locate
configuration source " + fileName);
+ }
load(url);
}
catch (ConfigurationException e)
@@ -338,6 +342,10 @@
if (file != null)
{
save(file);
+ }
+ else
+ {
+ throw new ConfigurationException("Could not save to URL " + url);
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
