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

[t...@freenetproject.org]

Author: toad
Date: 2007-10-26 16:38:09 +0000 (Fri, 26 Oct 2007)
New Revision: 15575

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

Modified: trunk/freenet/src/freenet/node/RequestHandler.java
===================================================================
--- trunk/freenet/src/freenet/node/RequestHandler.java  2007-10-26 16:36:30 UTC 
(rev 15574)
+++ trunk/freenet/src/freenet/node/RequestHandler.java  2007-10-26 16:38:09 UTC 
(rev 15575)
@@ -278,11 +278,11 @@
        private void finishOpennetNoRelay() {
                OpennetManager om = node.getOpennet();

-               if(!(om == null || !(source.isOpennet() || 
node.passOpennetRefsThroughDarknet()))) {
-                       if(finishOpennetNoRelayInner(om)) {
-                               return;
-                       }
-               }
+               if(om != null && (source.isOpennet() || 
node.passOpennetRefsThroughDarknet()) &&
+                               finishOpennetNoRelayInner(om))
+                       return;
+               
+               // Otherwise just ack it.
                Message msg = DMT.createFNPOpennetCompletedAck(uid);
                try {
                        source.sendAsync(msg, null, 0, this);