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

[nextgens at freenetproject.org]

Author: nextgens
Date: 2007-10-22 21:01:20 +0000 (Mon, 22 Oct 2007)
New Revision: 15483

Modified:
   trunk/freenet/src/freenet/node/RequestHandler.java
Log:
Simplify the logic, test for node.passOpennetRefsThroughDarknet() earlier on.

Don't send anything if we don't want to help path-folding.

Modified: trunk/freenet/src/freenet/node/RequestHandler.java
===================================================================
--- trunk/freenet/src/freenet/node/RequestHandler.java	2007-10-22 20:40:07 UTC (rev 15482)
+++ trunk/freenet/src/freenet/node/RequestHandler.java	2007-10-22 21:01:20 UTC (rev 15483)
@@ -148,7 +148,8 @@
             	node.addTransferringRequestHandler(uid);
             	if(bt.send(node.executor)) {
             		status = RequestSender.SUCCESS; // for byte logging
-           			finishOpennetNoRelayChecked();
+            		if(node.passOpennetRefsThroughDarknet())
+            			finishOpennetNoRelayChecked();
             	}
             }
             return;
@@ -187,7 +188,8 @@
             		finalTransferFailed = true;
             	} else {
     				// Successful CHK transfer, maybe path fold
-    				finishOpennetChecked();
+            		if(node.passOpennetRefsThroughDarknet())
+            			finishOpennetChecked();
             	}
 				status = rs.getStatus();
         	    return;
@@ -262,7 +264,7 @@
 	}
 
 	private void finishOpennetChecked() {
-		if(!(node.passOpennetRefsThroughDarknet() || source.isOpennet())) {
+		if(!source.isOpennet()) {
 			Message msg = DMT.createFNPOpennetCompletedAck(uid);
 			try {
 				source.sendAsync(msg, null, 0, this);
@@ -290,7 +292,7 @@
     }
     
 	private void finishOpennetNoRelayChecked() {
-		if(!(node.passOpennetRefsThroughDarknet() || source.isOpennet())) {
+		if(!source.isOpennet()) {
 			Message msg = DMT.createFNPOpennetCompletedAck(uid);
 			try {
 				source.sendAsync(msg, null, 0, this);