Author: toad
Date: 2007-12-18 19:55:38 +0000 (Tue, 18 Dec 2007)
New Revision: 16699
Modified:
trunk/freenet/src/freenet/client/async/SimpleManifestPutter.java
trunk/freenet/src/freenet/clients/http/HTTPRequestImpl.java
trunk/freenet/src/freenet/clients/http/filter/HTMLFilter.java
trunk/freenet/src/freenet/clients/http/filter/JPEGFilter.java
trunk/freenet/src/freenet/crypt/Yarrow.java
trunk/freenet/src/freenet/io/AddressTracker.java
trunk/freenet/src/freenet/node/fcp/FCPConnectionHandler.java
trunk/freenet/src/freenet/node/fcp/FCPServer.java
Log:
close() calls flush() but IGNORES ANY ERROR. If we want to hear about errors we
must call flush() explicitly.
Modified: trunk/freenet/src/freenet/client/async/SimpleManifestPutter.java
===================================================================
--- trunk/freenet/src/freenet/client/async/SimpleManifestPutter.java
2007-12-18 19:55:13 UTC (rev 16698)
+++ trunk/freenet/src/freenet/client/async/SimpleManifestPutter.java
2007-12-18 19:55:38 UTC (rev 16699)
@@ -428,6 +428,7 @@
zos.closeEntry();
// Both finish() and close() are necessary.
zos.finish();
+ zos.flush();
zos.close();
// Now we have to insert the ZIP.
Modified: trunk/freenet/src/freenet/clients/http/HTTPRequestImpl.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/HTTPRequestImpl.java 2007-12-18
19:55:13 UTC (rev 16698)
+++ trunk/freenet/src/freenet/clients/http/HTTPRequestImpl.java 2007-12-18
19:55:38 UTC (rev 16699)
@@ -515,6 +515,7 @@
bbos.write((int) b & 0xff);
}
+ bbos.flush();
bbos.close();
parts.put(name, filedata);
Modified: trunk/freenet/src/freenet/clients/http/filter/HTMLFilter.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/filter/HTMLFilter.java
2007-12-18 19:55:13 UTC (rev 16698)
+++ trunk/freenet/src/freenet/clients/http/filter/HTMLFilter.java
2007-12-18 19:55:38 UTC (rev 16699)
@@ -66,6 +66,7 @@
}
HTMLParseContext pc = new HTMLParseContext(r, w,
charset, cb, false);
pc.run(temp);
+ w.flush();
w.close();
}
finally {
Modified: trunk/freenet/src/freenet/clients/http/filter/JPEGFilter.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/filter/JPEGFilter.java
2007-12-18 19:55:13 UTC (rev 16698)
+++ trunk/freenet/src/freenet/clients/http/filter/JPEGFilter.java
2007-12-18 19:55:38 UTC (rev 16699)
@@ -73,6 +73,7 @@
Bucket ret = null;
try {
ret = readFilter(data, bf, charset, otherParams, cb,
deleteComments, deleteExif, os);
+ os.flush();
os.close();
} finally {
Closer.close(os);
Modified: trunk/freenet/src/freenet/crypt/Yarrow.java
===================================================================
--- trunk/freenet/src/freenet/crypt/Yarrow.java 2007-12-18 19:55:13 UTC (rev
16698)
+++ trunk/freenet/src/freenet/crypt/Yarrow.java 2007-12-18 19:55:38 UTC (rev
16699)
@@ -263,6 +263,7 @@
for(int i = 0; i < 32; i++)
dos.writeLong(nextLong());
+ dos.flush();
dos.close();
} catch(IOException e) {
Logger.error(this, "IOE while saving the seed file! : "
+ e.getMessage());
Modified: trunk/freenet/src/freenet/io/AddressTracker.java
===================================================================
--- trunk/freenet/src/freenet/io/AddressTracker.java 2007-12-18 19:55:13 UTC
(rev 16698)
+++ trunk/freenet/src/freenet/io/AddressTracker.java 2007-12-18 19:55:38 UTC
(rev 16699)
@@ -268,6 +268,7 @@
BufferedWriter bw = new BufferedWriter(osw);
SimpleFieldSet fs = getFieldset(bootID);
fs.writeTo(bw);
+ bw.flush();
bw.close();
fos = null;
dataBak.renameTo(data);
Modified: trunk/freenet/src/freenet/node/fcp/FCPConnectionHandler.java
===================================================================
--- trunk/freenet/src/freenet/node/fcp/FCPConnectionHandler.java
2007-12-18 19:55:13 UTC (rev 16698)
+++ trunk/freenet/src/freenet/node/fcp/FCPConnectionHandler.java
2007-12-18 19:55:38 UTC (rev 16699)
@@ -404,6 +404,7 @@
fos = new FileOutputStream(result.readFilename);
bos = new BufferedOutputStream(fos);
bos.write(result.readContent.getBytes("UTF-8"));
+ bos.flush();
bos.close();
} catch (IOException e) {
Logger.error(this, "Got a IOE while creating
the file (" + readFile.toString() + " ! " + e.getMessage());
Modified: trunk/freenet/src/freenet/node/fcp/FCPServer.java
===================================================================
--- trunk/freenet/src/freenet/node/fcp/FCPServer.java 2007-12-18 19:55:13 UTC
(rev 16698)
+++ trunk/freenet/src/freenet/node/fcp/FCPServer.java 2007-12-18 19:55:38 UTC
(rev 16699)
@@ -601,6 +601,7 @@
for(int
i=0;i<persistentRequests.length;i++)
persistentRequests[i].write(w);
+ w.flush();
w.close();
FileUtil.renameTo(compressedTemp,
compressedFinal);
} catch (IOException e) {
