antville/helma
antville/helma
1
1
Fork 0
Code Issues 5 Pull requests 7 Projects Releases 5 Activity Actions

* Work around Java/Windows quirk where File can't be renamed if a file with the

Browse source 
target name exists by deleting the existing file.
http://helma.org/bugs/show_bug.cgi?id=338
* Catch all Exceptions when reading XML in getNode, and rethrow as IOException
rather then ObjectNotFoundException (which is only thrown if the file in question
doesn't exist).
This commit is contained in:
hns 2004-02-19 10:47:43 +00:00
parent c1ef213150
commit 7bfb70430e
1 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/helma/objectmodel/db/XmlDatabase.java
View file

@ -171,7 +171,7 @@ public final class XmlDatabase implements IDatabase {
File f = new File(dbHomeDir, kstr + ".xml");
if (!f.exists()) {
throw new ObjectNotFoundException("Object not found for key " + kstr + ".");
throw new ObjectNotFoundException("Object not found for key " + kstr);
}
try {
@ -179,9 +179,9 @@ public final class XmlDatabase implements IDatabase {
Node node = reader.read(f);
return node;
} catch (RuntimeException x) {
nmgr.app.logError("Error reading " +f+": " + x.toString());
throw new ObjectNotFoundException(x.toString());
} catch (Exception x) {
nmgr.app.logError("Error reading " +f, x);
throw new IOException(x.toString());
}
}
@ -261,6 +261,11 @@ public final class XmlDatabase implements IDatabase {
for (int i=0; i<l; i++) {
Resource res = (Resource) writeFiles.get(i);
try {
// because of a Java/Windows quirk, we have to delete
// the existing file before trying to overwrite it
if (res.file.exists()) {
res.file.delete();
}
// move temporary file to permanent name
if (res.tmpfile.renameTo(res.file)) {
// success - delete tmp file