Author: nextgens
Date: 2007-11-30 11:50:57 +0000 (Fri, 30 Nov 2007)
New Revision: 16120
Modified:
trunk/freenet/src/freenet/clients/http/bookmark/BookmarkManager.java
trunk/freenet/src/freenet/l10n/L10n.java
trunk/freenet/src/freenet/node/OpennetManager.java
trunk/freenet/src/freenet/node/PeerManager.java
trunk/freenet/src/freenet/node/fcp/FCPServer.java
Log:
Use close() and not the closer: we want an IOE to be raised if needed!
Modified: trunk/freenet/src/freenet/clients/http/bookmark/BookmarkManager.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/bookmark/BookmarkManager.java
2007-11-30 11:49:19 UTC (rev 16119)
+++ trunk/freenet/src/freenet/clients/http/bookmark/BookmarkManager.java
2007-11-30 11:50:57 UTC (rev 16120)
@@ -368,7 +368,7 @@
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());
}
Modified: trunk/freenet/src/freenet/l10n/L10n.java
===================================================================
--- trunk/freenet/src/freenet/l10n/L10n.java 2007-11-30 11:49:19 UTC (rev
16119)
+++ trunk/freenet/src/freenet/l10n/L10n.java 2007-11-30 11:50:57 UTC (rev
16120)
@@ -143,6 +143,7 @@
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/OpennetManager.java
===================================================================
--- trunk/freenet/src/freenet/node/OpennetManager.java 2007-11-30 11:49:19 UTC
(rev 16119)
+++ trunk/freenet/src/freenet/node/OpennetManager.java 2007-11-30 11:50:57 UTC
(rev 16120)
@@ -146,15 +146,22 @@
if(orig.exists()) backup.delete();
FileOutputStream fos = null;
+ OutputStreamWriter osr = null;
+ BufferedWriter bw = null;
try {
fos = new FileOutputStream(backup);
- OutputStreamWriter osr = new OutputStreamWriter(fos,
"UTF-8");
- BufferedWriter bw = new BufferedWriter(osr);
+ osr = new OutputStreamWriter(fos, "UTF-8");
+ bw = new BufferedWriter(osr);
fs.writeTo(bw);
+
bw.close();
+ osr.close();
+ fos.close();
FileUtil.renameTo(backup, orig);
} catch (IOException e) {
- Closer.close(fos);
+ Closer.close(bw);
+ Closer.close(osr);
+ Closer.close(fos);
}
}
Modified: trunk/freenet/src/freenet/node/PeerManager.java
===================================================================
--- trunk/freenet/src/freenet/node/PeerManager.java 2007-11-30 11:49:19 UTC
(rev 16119)
+++ trunk/freenet/src/freenet/node/PeerManager.java 2007-11-30 11:50:57 UTC
(rev 16120)
@@ -880,6 +880,9 @@
boolean succeeded = writePeers(bw, peers);
bw.close(); bw = null;
if(!succeeded) return;
+
+ w.close();
+ fos.close();
File fnam = new File(filename);
FileUtil.renameTo(new File(f), fnam);
} catch (IOException e) {
Modified: trunk/freenet/src/freenet/node/fcp/FCPServer.java
===================================================================
--- trunk/freenet/src/freenet/node/fcp/FCPServer.java 2007-11-30 11:49:19 UTC
(rev 16119)
+++ trunk/freenet/src/freenet/node/fcp/FCPServer.java 2007-11-30 11:50:57 UTC
(rev 16120)
@@ -601,11 +601,11 @@
for(int
i=0;i<persistentRequests.length;i++)
persistentRequests[i].write(w);
- Closer.close(w);
- Closer.close(osw);
- Closer.close(gos);
- Closer.close(bos);
- Closer.close(fos);
+ w.close();
+ osw.close();
+ gos.close();
+ bos.close();
+ fos.close();
FileUtil.renameTo(compressedTemp,
compressedFinal);
} catch (IOException e) {
Logger.error(this, "Cannot write
persistent requests to disk: "+e);
