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

[t...@freenetproject.org]

Author: toad
Date: 2007-10-26 16:47:53 +0000 (Fri, 26 Oct 2007)
New Revision: 15580

Modified:
   trunk/freenet/src/freenet/node/RequestHandler.java
Log:
further simplify logic

Modified: trunk/freenet/src/freenet/node/RequestHandler.java
===================================================================
--- trunk/freenet/src/freenet/node/RequestHandler.java  2007-10-26 16:45:11 UTC 
(rev 15579)
+++ trunk/freenet/src/freenet/node/RequestHandler.java  2007-10-26 16:47:53 UTC 
(rev 15580)
@@ -265,7 +265,7 @@
                OpennetManager om = node.getOpennet();
                if(om != null &&
                                (node.passOpennetRefsThroughDarknet() && 
node.isOpennetEnabled())) {
-                       finishOpennetInner(om);
+                       if(finishOpennetInner(om)) return;
                }

                Message msg = DMT.createFNPOpennetCompletedAck(uid);
@@ -296,27 +296,18 @@
                }
        }

-       private void finishOpennetInner(OpennetManager om) {
+       private boolean finishOpennetInner(OpennetManager om) {
                byte[] noderef = rs.waitForOpennetNoderef();
                if(noderef == null) {
-                       if(!finishOpennetNoRelayInner(om)) {
-                               Message msg = 
DMT.createFNPOpennetCompletedAck(uid);
-                               try {
-                                       source.sendAsync(msg, null, 0, this);
-                               } catch (NotConnectedException e) {
-                                       // Oh well...
-                               }
-                               return;
-                       }
-                       return;
+                       return finishOpennetNoRelayInner(om);
                }

                if(node.random.nextInt(OpennetManager.RESET_PATH_FOLDING_PROB) 
== 0) {
-                       finishOpennetNoRelayInner(om);
-                       return;
+                       return finishOpennetNoRelayInner(om);
                }

        finishOpennetRelay(noderef, om);
+       return true;
     }

        /**