Author: toad
Date: 2009-04-23 16:50:06 +0000 (Thu, 23 Apr 2009)
New Revision: 27262
Modified:
trunk/freenet/src/freenet/node/Node.java
Log:
Catch anything thrown here and return null so the request can complete one way
or another
Modified: trunk/freenet/src/freenet/node/Node.java
===================================================================
--- trunk/freenet/src/freenet/node/Node.java 2009-04-23 16:04:51 UTC (rev
27261)
+++ trunk/freenet/src/freenet/node/Node.java 2009-04-23 16:50:06 UTC (rev
27262)
@@ -3919,7 +3919,13 @@
public OpennetPeerNode addNewOpennetNode(SimpleFieldSet fs) throws
FSParseException, PeerParseException, ReferenceSignatureVerificationException {
// FIXME: perhaps this should throw OpennetDisabledExcemption
rather than returing false?
if(opennet == null) return null;
- return opennet.addNewOpennetNode(fs);
+ try {
+ return opennet.addNewOpennetNode(fs);
+ } catch (Throwable t) {
+ // Don't break the code flow in the caller which is
normally a request.
+ Logger.error(this, "Caught "+t+" adding opennet node
from fieldset", t);
+ return null;
+ }
}
public byte[] getOpennetIdentity() {
_______________________________________________
cvs mailing list
[email protected]
http://emu.freenetproject.org/cgi-bin/mailman/listinfo/cvs
