[freenet-cvs] r15490 - trunk/freenet/src/freenet/node

[t...@freenetproject.org]

Author: toad
Date: 2007-10-23 00:21:50 +0000 (Tue, 23 Oct 2007)
New Revision: 15490

Modified:
   trunk/freenet/src/freenet/node/RequestHandler.java
Log:
trivial refactor

Modified: trunk/freenet/src/freenet/node/RequestHandler.java
===================================================================
--- trunk/freenet/src/freenet/node/RequestHandler.java  2007-10-23 00:20:48 UTC 
(rev 15489)
+++ trunk/freenet/src/freenet/node/RequestHandler.java  2007-10-23 00:21:50 UTC 
(rev 15490)
@@ -351,29 +351,18 @@
                        try {
                                        if(!node.addNewOpennetNode(ref)) {
                                                Logger.normal(this, "Asked for 
opennet ref but didn't want it for "+this+" :\n"+ref);
-                                               return;
                                        } else {
                                                Logger.normal(this, "Added 
opennet noderef in "+this);
                                        }
                                } catch (FSParseException e) {
                                        Logger.error(this, "Could not parse 
opennet noderef for "+this+" from "+source, e);
-                                       return;
                                } catch (PeerParseException e) {
                                        Logger.error(this, "Could not parse 
opennet noderef for "+this+" from "+source, e);
-                                       return;
                                } catch 
(ReferenceSignatureVerificationException e) {
                                        Logger.error(this, "Bad signature on 
opennet noderef for "+this+" from "+source+" : "+e, e);
-                                       return;
                                }
-                       } else {
-                               Message msg = 
DMT.createFNPOpennetCompletedAck(uid);
-                               try {
-                                       source.sendAsync(msg, null, 0, this);
-                               } catch (NotConnectedException e) {
-                                       // Oh well...
-                               }
-                       }
-               } else {
+                               return;
+               }
                        Message msg = DMT.createFNPOpennetCompletedAck(uid);
                        try {
                                source.sendAsync(msg, null, 0, this);