Author: nextgens
Date: 2007-11-30 15:16:39 +0000 (Fri, 30 Nov 2007)
New Revision: 16134
Modified:
trunk/freenet/src/freenet/clients/http/filter/CSSReadFilter.java
trunk/freenet/src/freenet/clients/http/filter/ContentFilter.java
trunk/freenet/src/freenet/clients/http/filter/GIFFilter.java
trunk/freenet/src/freenet/clients/http/filter/HTMLFilter.java
trunk/freenet/src/freenet/clients/http/filter/JPEGFilter.java
trunk/freenet/src/freenet/clients/http/filter/PNGFilter.java
trunk/freenet/src/freenet/crypt/SHA256.java
trunk/freenet/src/freenet/crypt/Yarrow.java
trunk/freenet/src/freenet/node/OpennetManager.java
trunk/freenet/src/freenet/node/PeerManager.java
trunk/freenet/src/freenet/node/Persister.java
trunk/freenet/src/freenet/node/fcp/FCPConnectionHandler.java
trunk/freenet/src/freenet/node/fcp/FCPServer.java
trunk/freenet/src/freenet/support/SimpleFieldSet.java
Log:
More bugfixes
Modified: trunk/freenet/src/freenet/clients/http/filter/CSSReadFilter.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/filter/CSSReadFilter.java
2007-11-30 15:10:06 UTC (rev 16133)
+++ trunk/freenet/src/freenet/clients/http/filter/CSSReadFilter.java
2007-11-30 15:16:39 UTC (rev 16134)
@@ -55,6 +55,7 @@
}
CSSParser parser = new CSSParser(r, w, false, cb);
parser.parse();
+ r.close();
}
finally {
// Do *not* close output related things here!
Modified: trunk/freenet/src/freenet/clients/http/filter/ContentFilter.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/filter/ContentFilter.java
2007-11-30 15:10:06 UTC (rev 16133)
+++ trunk/freenet/src/freenet/clients/http/filter/ContentFilter.java
2007-11-30 15:16:39 UTC (rev 16134)
@@ -277,6 +277,9 @@
return "UTF-EBCDIC";
if(startsWith(data, bom_bocu_1))
return "BOCU-1";
+
+ is.close();
+
return null;
}
finally {
Modified: trunk/freenet/src/freenet/clients/http/filter/GIFFilter.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/filter/GIFFilter.java
2007-11-30 15:10:06 UTC (rev 16133)
+++ trunk/freenet/src/freenet/clients/http/filter/GIFFilter.java
2007-11-30 15:16:39 UTC (rev 16134)
@@ -45,6 +45,7 @@
if((!Arrays.equals(headerCheck, gif87aHeader)) &&
(!Arrays.equals(headerCheck, gif89aHeader))) {
throwHeaderError(l10n("invalidHeaderTitle"),
l10n("invalidHeader"));
}
+ dis.close();
} finally {
Closer.close(dis);
}
Modified: trunk/freenet/src/freenet/clients/http/filter/HTMLFilter.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/filter/HTMLFilter.java
2007-11-30 15:10:06 UTC (rev 16133)
+++ trunk/freenet/src/freenet/clients/http/filter/HTMLFilter.java
2007-11-30 15:16:39 UTC (rev 16134)
@@ -67,8 +67,6 @@
HTMLParseContext pc = new HTMLParseContext(r, w,
charset, cb, false);
pc.run(temp);
w.close();
- osw.close();
- os.close();
}
finally {
Closer.close(w);
Modified: trunk/freenet/src/freenet/clients/http/filter/JPEGFilter.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/filter/JPEGFilter.java
2007-11-30 15:10:06 UTC (rev 16133)
+++ trunk/freenet/src/freenet/clients/http/filter/JPEGFilter.java
2007-11-30 15:16:39 UTC (rev 16134)
@@ -73,6 +73,7 @@
Bucket ret = null;
try {
ret = readFilter(data, bf, charset, otherParams, cb,
deleteComments, deleteExif, os);
+ os.close();
} finally {
Closer.close(os);
}
@@ -295,6 +296,8 @@
}
}
+ dis.close();
+ output.close();
// In future, maybe we will check the other chunks too.
// In particular, we may want to delete, or filter, the
comment blocks.
// FIXME
Modified: trunk/freenet/src/freenet/clients/http/filter/PNGFilter.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/filter/PNGFilter.java
2007-11-30 15:10:06 UTC (rev 16133)
+++ trunk/freenet/src/freenet/clients/http/filter/PNGFilter.java
2007-11-30 15:16:39 UTC (rev 16134)
@@ -45,6 +45,7 @@
throw new DataFilterException(title, title,
"<p>"+message+"</p>", new
HTMLNode("p").addChild("#", message));
}
+ dis.close();
} finally {
Closer.close(dis);
Closer.close(bis);
Modified: trunk/freenet/src/freenet/crypt/SHA256.java
===================================================================
--- trunk/freenet/src/freenet/crypt/SHA256.java 2007-11-30 15:10:06 UTC (rev
16133)
+++ trunk/freenet/src/freenet/crypt/SHA256.java 2007-11-30 15:16:39 UTC (rev
16134)
@@ -317,6 +317,7 @@
md.update(buf, 0, readBytes);
readBytes = is.read(buf);
}
+ is.close();
} finally {
Closer.close(is);
}
Modified: trunk/freenet/src/freenet/crypt/Yarrow.java
===================================================================
--- trunk/freenet/src/freenet/crypt/Yarrow.java 2007-11-30 15:10:06 UTC (rev
16133)
+++ trunk/freenet/src/freenet/crypt/Yarrow.java 2007-11-30 15:16:39 UTC (rev
16134)
@@ -111,6 +111,7 @@
consumeBytes(buf);
dis.readFully(buf);
consumeBytes(buf);
+ dis.close();
} catch (Throwable t) {
Logger.normal(this, "Can't read /dev/hwrng even
though exists and is readable: "+t, t);
} finally {
@@ -222,7 +223,7 @@
acceptEntropy(seedFile, dis.readLong(),
64);
} catch(EOFException f) {
}
-
+ dis.close();
} catch(IOException e) {
Logger.error(this, "IOE trying to read the seedfile
from disk : " + e.getMessage());
}
@@ -261,7 +262,8 @@
for(int i = 0; i < 32; i++)
dos.writeLong(nextLong());
-
+
+ dos.close();
} catch(IOException e) {
Logger.error(this, "IOE while saving the seed file! : "
+ e.getMessage());
}
Modified: trunk/freenet/src/freenet/node/OpennetManager.java
===================================================================
--- trunk/freenet/src/freenet/node/OpennetManager.java 2007-11-30 15:10:06 UTC
(rev 16133)
+++ trunk/freenet/src/freenet/node/OpennetManager.java 2007-11-30 15:16:39 UTC
(rev 16134)
@@ -155,8 +155,6 @@
fs.writeTo(bw);
bw.close();
- osr.close();
- fos.close();
FileUtil.renameTo(backup, orig);
} catch (IOException e) {
Closer.close(bw);
Modified: trunk/freenet/src/freenet/node/PeerManager.java
===================================================================
--- trunk/freenet/src/freenet/node/PeerManager.java 2007-11-30 15:10:06 UTC
(rev 16133)
+++ trunk/freenet/src/freenet/node/PeerManager.java 2007-11-30 15:16:39 UTC
(rev 16134)
@@ -881,8 +881,6 @@
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/Persister.java
===================================================================
--- trunk/freenet/src/freenet/node/Persister.java 2007-11-30 15:10:06 UTC
(rev 16133)
+++ trunk/freenet/src/freenet/node/Persister.java 2007-11-30 15:16:39 UTC
(rev 16134)
@@ -62,16 +62,13 @@
FileOutputStream fos = new
FileOutputStream(persistTemp);
try {
fs.writeTo(fos);
+ fos.close();
+ FileUtil.renameTo(persistTemp, persistTarget);
} catch (IOException e) {
- try {
- fos.close();
- persistTemp.delete();
- return;
- } catch (IOException e1) {}
+ persistTemp.delete();
+ } finally {
+ Closer.close(fos);
}
- Closer.close(fos);
-
- FileUtil.renameTo(persistTemp, persistTarget);
} catch (FileNotFoundException e) {
Logger.error(this, "Could not store throttle data to
disk: "+e, e);
return;
Modified: trunk/freenet/src/freenet/node/fcp/FCPConnectionHandler.java
===================================================================
--- trunk/freenet/src/freenet/node/fcp/FCPConnectionHandler.java
2007-11-30 15:10:06 UTC (rev 16133)
+++ trunk/freenet/src/freenet/node/fcp/FCPConnectionHandler.java
2007-11-30 15:16:39 UTC (rev 16134)
@@ -400,7 +400,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());
} finally {
Modified: trunk/freenet/src/freenet/node/fcp/FCPServer.java
===================================================================
--- trunk/freenet/src/freenet/node/fcp/FCPServer.java 2007-11-30 15:10:06 UTC
(rev 16133)
+++ trunk/freenet/src/freenet/node/fcp/FCPServer.java 2007-11-30 15:16:39 UTC
(rev 16134)
@@ -602,10 +602,6 @@
persistentRequests[i].write(w);
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);
Modified: trunk/freenet/src/freenet/support/SimpleFieldSet.java
===================================================================
--- trunk/freenet/src/freenet/support/SimpleFieldSet.java 2007-11-30
15:10:06 UTC (rev 16133)
+++ trunk/freenet/src/freenet/support/SimpleFieldSet.java 2007-11-30
15:16:39 UTC (rev 16134)
@@ -2,7 +2,6 @@
import java.io.BufferedInputStream;
import java.io.BufferedReader;
-import java.io.DataInputStream;
import java.io.EOFException;
import java.io.File;
import java.io.FileInputStream;
@@ -689,6 +688,8 @@
}
br = new BufferedReader(isr);
SimpleFieldSet fs = new SimpleFieldSet(br,
allowMultiple, shortLived);
+ br.close();
+
return fs;
} finally {
Closer.close(br);
@@ -718,8 +719,6 @@
bw = new BufferedWriter(osw);
writeTo(bw);
bw.close();
- osw.close();
- bos.close();
}finally {
Closer.close(bw);
Closer.close(osw);
