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

[toad at freenetproject.org]

Author: toad
Date: 2007-10-23 00:20:48 +0000 (Tue, 23 Oct 2007)
New Revision: 15489

Modified:
   trunk/freenet/src/freenet/node/RequestHandler.java
Log:
Comments. Partial revert of nextgens' commit: We want to send at least an ack in all cases.

Modified: trunk/freenet/src/freenet/node/RequestHandler.java
===================================================================
--- trunk/freenet/src/freenet/node/RequestHandler.java	2007-10-23 00:10:20 UTC (rev 15488)
+++ trunk/freenet/src/freenet/node/RequestHandler.java	2007-10-23 00:20:48 UTC (rev 15489)
@@ -148,8 +148,10 @@
             	node.addTransferringRequestHandler(uid);
             	if(bt.send(node.executor)) {
             		status = RequestSender.SUCCESS; // for byte logging
-            		if(node.passOpennetRefsThroughDarknet())
-            			finishOpennetNoRelayChecked();
+            		// We've fetched it from our datastore, so there won't be a downstream noderef.
+            		// But we want to send at least an FNPOpennetCompletedAck, otherwise the request source
+            		// may have to timeout waiting for one.
+           			finishOpennetNoRelayChecked();
             	}
             }
             return;