Author: nextgens
Date: 2007-11-29 17:28:09 +0000 (Thu, 29 Nov 2007)
New Revision: 16093
Modified:
trunk/freenet/src/freenet/clients/http/filter/GIFFilter.java
trunk/freenet/src/freenet/config/FilePersistentConfig.java
trunk/freenet/src/freenet/crypt/SHA256.java
trunk/freenet/src/freenet/l10n/L10n.java
trunk/freenet/src/freenet/node/fcp/FCPConnectionInputHandler.java
Log:
likewise
Modified: trunk/freenet/src/freenet/clients/http/filter/GIFFilter.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/filter/GIFFilter.java
2007-11-29 17:21:40 UTC (rev 16092)
+++ trunk/freenet/src/freenet/clients/http/filter/GIFFilter.java
2007-11-29 17:28:09 UTC (rev 16093)
@@ -14,6 +14,7 @@
import freenet.support.HTMLNode;
import freenet.support.api.Bucket;
import freenet.support.api.BucketFactory;
+import freenet.support.io.Closer;
/**
* Content filter for PNG's.
@@ -45,7 +46,7 @@
throwHeaderError(l10n("invalidHeaderTitle"),
l10n("invalidHeader"));
}
} finally {
- dis.close();
+ Closer.close(dis);
}
return data;
}
Modified: trunk/freenet/src/freenet/config/FilePersistentConfig.java
===================================================================
--- trunk/freenet/src/freenet/config/FilePersistentConfig.java 2007-11-29
17:21:40 UTC (rev 16092)
+++ trunk/freenet/src/freenet/config/FilePersistentConfig.java 2007-11-29
17:28:09 UTC (rev 16093)
@@ -93,19 +93,19 @@
* @throws IOException */
private static SimpleFieldSet initialLoad(File toRead) throws
IOException {
if(toRead == null) return null;
- FileInputStream fis = new FileInputStream(toRead);
- BufferedInputStream bis = new BufferedInputStream(fis);
+ FileInputStream fis = null;
+ BufferedInputStream bis = null;
+ LineReadingInputStream lis = null;
try {
- LineReadingInputStream lis = new
LineReadingInputStream(bis);
+ fis = new FileInputStream(toRead);
+ bis = new BufferedInputStream(fis);
+ lis = new LineReadingInputStream(bis);
// Config file is UTF-8 too!
return new SimpleFieldSet(lis, 1024*1024, 128, true,
true, true, true); // FIXME? advanced users may edit the config file, hence
true?
} finally {
- try {
- fis.close();
- } catch (IOException e) {
- System.err.println("Could not close "+toRead+":
"+e);
- e.printStackTrace();
- }
+ Closer.close(lis);
+ Closer.close(bis);
+ Closer.close(fis);
}
}
Modified: trunk/freenet/src/freenet/crypt/SHA256.java
===================================================================
--- trunk/freenet/src/freenet/crypt/SHA256.java 2007-11-29 17:21:40 UTC (rev
16092)
+++ trunk/freenet/src/freenet/crypt/SHA256.java 2007-11-29 17:28:09 UTC (rev
16093)
@@ -51,6 +51,7 @@
import freenet.node.NodeInitException;
import freenet.support.HexUtil;
import freenet.support.Logger;
+import freenet.support.io.Closer;
/**
* @author Jeroen C. van Gelderen (gelderen at cryptix.org)
@@ -317,7 +318,7 @@
readBytes = is.read(buf);
}
} finally {
- if(is != null) is.close();
+ Closer.close(is);
}
}
Modified: trunk/freenet/src/freenet/l10n/L10n.java
===================================================================
--- trunk/freenet/src/freenet/l10n/L10n.java 2007-11-29 17:21:40 UTC (rev
16092)
+++ trunk/freenet/src/freenet/l10n/L10n.java 2007-11-29 17:28:09 UTC (rev
16093)
@@ -340,7 +340,7 @@
Logger.error("L10n", "Error while loading the l10n file
from " + name + " :" + e.getMessage(), e);
result = null;
} finally {
- if (in != null) try { in.close(); } catch (Throwable
ignore) {}
+ Closer.close(in);
}
return result;
Modified: trunk/freenet/src/freenet/node/fcp/FCPConnectionInputHandler.java
===================================================================
--- trunk/freenet/src/freenet/node/fcp/FCPConnectionInputHandler.java
2007-11-29 17:21:40 UTC (rev 16092)
+++ trunk/freenet/src/freenet/node/fcp/FCPConnectionInputHandler.java
2007-11-29 17:28:09 UTC (rev 16093)
@@ -12,6 +12,7 @@
import freenet.support.Logger;
import freenet.support.OOMHandler;
import freenet.support.SimpleFieldSet;
+import freenet.support.io.Closer;
import freenet.support.io.LineReadingInputStream;
public class FCPConnectionInputHandler implements Runnable {
@@ -54,17 +55,13 @@
if(WrapperManager.hasShutdownHookBeenTriggered()) {
FCPMessage msg = new
ProtocolErrorMessage(ProtocolErrorMessage.SHUTTING_DOWN,true,"The node is
shutting down","Node",false);
handler.outputHandler.queue(msg);
- try {
- is.close();
- } catch (IOException e) {
- // Don't care
- }
+ Closer.close(is);
return;
}
// Read a message
String messageType = lis.readLine(128, 128, true);
if(messageType == null) {
- is.close();
+ Closer.close(is);
return;
}
if(messageType.equals(""))
@@ -89,7 +86,7 @@
FCPMessage err = new
ProtocolErrorMessage(ProtocolErrorMessage.CLIENT_HELLO_MUST_BE_FIRST_MESSAGE,
true, null, null, false);
handler.outputHandler.queue(err);
handler.close();
- is.close();
+ Closer.close(is);
return;
} else {
FCPMessage err = new
ProtocolErrorMessage(e.protocolCode, false, e.getMessage(), e.ident, e.global);
@@ -101,7 +98,7 @@
FCPMessage err = new
ProtocolErrorMessage(ProtocolErrorMessage.CLIENT_HELLO_MUST_BE_FIRST_MESSAGE,
true, null, null, false);
handler.outputHandler.queue(err);
handler.close();
- is.close();
+ Closer.close(is);
return;
}
if(msg instanceof BaseDataCarryingMessage) {
@@ -130,7 +127,7 @@
}
firstMessage = false;
if(handler.isClosed()) {
- is.close();
+ Closer.close(is);
return;
}
}
