I2P_Developers/i2p.itoopie
3
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

* Addressbook: Fix rename error on Windows (tkt 323 - thanks RN!)

Browse Source
This commit is contained in:
zzz
2010-11-21 20:40:42 +00:00
parent 106af9967a
commit 9e8af7367e
1 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
apps/addressbook/java/src/net/i2p/addressbook/ConfigParser.java
View File

@ -49,6 +49,8 @@ import net.i2p.util.SecureFileOutputStream;
*/ */
class ConfigParser { class ConfigParser {
private static final boolean isWindows = System.getProperty("os.name").startsWith("Win");
/** /**
* Strip the comments from a String. Lines that begin with '#' and ';' are * Strip the comments from a String. Lines that begin with '#' and ';' are
* considered comments, as well as any part of a line after a '#'. * considered comments, as well as any part of a line after a '#'.
@ -276,7 +278,8 @@ class ConfigParser {
* Write contents of Map map to the File file. Output is written * Write contents of Map map to the File file. Output is written
* with one key, value pair on each line, in the format: key=value. * with one key, value pair on each line, in the format: key=value.
* Write to a temp file in the same directory and then rename, to not corrupt * Write to a temp file in the same directory and then rename, to not corrupt
* simultaneous accesses by the router. * simultaneous accesses by the router. Except on Windows where renameTo()
* will fail if the target exists.
* *
* @param map * @param map
* A Map to write to file. * A Map to write to file.
@ -286,14 +289,19 @@ class ConfigParser {
* if file cannot be written to. * if file cannot be written to.
*/ */
public static void write(Map map, File file) throws IOException { public static void write(Map map, File file) throws IOException {
File tmp = SecureFile.createTempFile("hoststxt-", ".tmp", file.getAbsoluteFile().getParentFile()); boolean success = false;
if (!isWindows) {
File tmp = SecureFile.createTempFile("temp-", ".tmp", file.getAbsoluteFile().getParentFile());
ConfigParser ConfigParser
.write(map, new BufferedWriter(new OutputStreamWriter(new SecureFileOutputStream(tmp), "UTF-8"))); .write(map, new BufferedWriter(new OutputStreamWriter(new SecureFileOutputStream(tmp), "UTF-8")));
boolean success = tmp.renameTo(file); success = tmp.renameTo(file);
if (!success) {
tmp.delete();
//System.out.println("Warning: addressbook rename fail from " + tmp + " to " + file);
}
}
if (!success) { if (!success) {
// hmm, that didn't work, try it the old way // hmm, that didn't work, try it the old way
System.out.println("Warning: addressbook rename fail from " + tmp + " to " + file);
tmp.delete();
ConfigParser ConfigParser
.write(map, new BufferedWriter(new OutputStreamWriter(new SecureFileOutputStream(file), "UTF-8"))); .write(map, new BufferedWriter(new OutputStreamWriter(new SecureFileOutputStream(file), "UTF-8")));
} }