Author: toad
Date: 2007-12-17 13:18:46 +0000 (Mon, 17 Dec 2007)
New Revision: 16656
Modified:
trunk/freenet/src/freenet/clients/http/bookmark/BookmarkManager.java
trunk/freenet/src/freenet/config/FilePersistentConfig.java
trunk/freenet/src/freenet/l10n/L10n.java
trunk/freenet/src/freenet/node/Node.java
trunk/freenet/src/freenet/node/Persister.java
Log:
SFS.writeTo() flush()es then close()es. We don't need to close() outside it -
not except in finally blocks with Closer. It will throw an exception if close
fails.
Should fix LOTS of out-of-disk-space-causes-core-files-to-be-clobbered bugs!
Modified: trunk/freenet/src/freenet/clients/http/bookmark/BookmarkManager.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/bookmark/BookmarkManager.java
2007-12-17 13:12:59 UTC (rev 16655)
+++ trunk/freenet/src/freenet/clients/http/bookmark/BookmarkManager.java
2007-12-17 13:18:46 UTC (rev 16656)
@@ -330,7 +330,6 @@
try {
fos = new FileOutputStream(backupBookmarksFile);
sfs.writeTo(fos);
- fos.close();
if(!FileUtil.renameTo(backupBookmarksFile,
bookmarksFile))
Logger.error(this, "Unable to rename " +
backupBookmarksFile.toString() + " to " + bookmarksFile.toString());
} catch(IOException ioe) {
Modified: trunk/freenet/src/freenet/config/FilePersistentConfig.java
===================================================================
--- trunk/freenet/src/freenet/config/FilePersistentConfig.java 2007-12-17
13:12:59 UTC (rev 16655)
+++ trunk/freenet/src/freenet/config/FilePersistentConfig.java 2007-12-17
13:18:46 UTC (rev 16656)
@@ -140,7 +140,6 @@
synchronized(this) {
fs.writeTo(fos);
}
- fos.close();
FileUtil.renameTo(tempFilename, filename);
}
finally {
Modified: trunk/freenet/src/freenet/l10n/L10n.java
===================================================================
--- trunk/freenet/src/freenet/l10n/L10n.java 2007-12-17 13:12:59 UTC (rev
16655)
+++ trunk/freenet/src/freenet/l10n/L10n.java 2007-12-17 13:18:46 UTC (rev
16656)
@@ -143,7 +143,6 @@
fos = new FileOutputStream(tempFile);
L10n.translationOverride.writeTo(fos);
- fos.close();
FileUtil.renameTo(tempFile, finalFile);
Logger.normal("L10n", "Override file saved
successfully!");
} catch (IOException e) {
Modified: trunk/freenet/src/freenet/node/Node.java
===================================================================
--- trunk/freenet/src/freenet/node/Node.java 2007-12-17 13:12:59 UTC (rev
16655)
+++ trunk/freenet/src/freenet/node/Node.java 2007-12-17 13:18:46 UTC (rev
16656)
@@ -486,7 +486,6 @@
try {
fos = new FileOutputStream(backup);
fs.writeTo(fos);
- fos.close();
FileUtil.renameTo(backup, orig);
} catch (IOException ioe){
Logger.error(this, "IOE :"+ioe.getMessage(), ioe);
Modified: trunk/freenet/src/freenet/node/Persister.java
===================================================================
--- trunk/freenet/src/freenet/node/Persister.java 2007-12-17 13:12:59 UTC
(rev 16655)
+++ trunk/freenet/src/freenet/node/Persister.java 2007-12-17 13:18:46 UTC
(rev 16656)
@@ -62,7 +62,6 @@
FileOutputStream fos = new
FileOutputStream(persistTemp);
try {
fs.writeTo(fos);
- fos.close();
FileUtil.renameTo(persistTemp, persistTarget);
} catch (IOException e) {
persistTemp.delete();
