Author: nextgens
Date: 2007-11-23 13:48:32 +0000 (Fri, 23 Nov 2007)
New Revision: 15940
Modified:
trunk/freenet/src/freenet/node/fcp/FCPServer.java
Log:
optimize, cleanup
Modified: trunk/freenet/src/freenet/node/fcp/FCPServer.java
===================================================================
--- trunk/freenet/src/freenet/node/fcp/FCPServer.java 2007-11-23 13:40:24 UTC
(rev 15939)
+++ trunk/freenet/src/freenet/node/fcp/FCPServer.java 2007-11-23 13:48:32 UTC
(rev 15940)
@@ -581,11 +581,16 @@
File compressedTemp = new
File(persistentDownloadsTempFile+".gz");
File compressedFinal = new
File(persistentDownloadsFile.toString()+".gz");
+ // delete files created by check()
+ persistentDownloadsFile.delete();
+ persistentDownloadsTempFile.delete();
+
FileOutputStream fos = null;
BufferedOutputStream bos = null;
GZIPOutputStream gos = null;
OutputStreamWriter osw = null;
BufferedWriter w = null;
+
try {
fos = new
FileOutputStream(compressedTemp);
bos = new BufferedOutputStream(fos);
@@ -629,13 +634,10 @@
GZIPInputStream gis = null;
try {
File file = new File(persistentDownloadsFile+".gz");
- if(!file.exists() || !file.canRead() || file.length()
== 0)
- throw new IOException(file.toURI() + " is empty or
doesn't exist!");
fis = new FileInputStream(file);
gis = new GZIPInputStream(fis);
bis = new BufferedInputStream(gis);
loadPersistentRequests(bis);
- file.delete();
} catch (IOException e) {
Logger.error(this, "IOE : " + e.getMessage(), e);
Logger.normal(this, "Let's try to load
"+persistentDownloadsFile+" then.");
@@ -648,7 +650,6 @@
loadPersistentRequests(bis);
} catch (IOException e1) {
Logger.normal(this, "It's corrupted too : Not
reading any persistent requests from disk: "+e1);
- persistentDownloadsFile.delete();
return;
}
} finally {
