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

[t...@freenetproject.org]

Author: toad
Date: 2007-04-14 15:52:50 +0000 (Sat, 14 Apr 2007)
New Revision: 12694

Modified:
   trunk/freenet/src/freenet/node/InsertHandler.java
Log:
Detect receive failed on the handler

Modified: trunk/freenet/src/freenet/node/InsertHandler.java
===================================================================
--- trunk/freenet/src/freenet/node/InsertHandler.java   2007-04-14 15:49:50 UTC 
(rev 12693)
+++ trunk/freenet/src/freenet/node/InsertHandler.java   2007-04-14 15:52:50 UTC 
(rev 12694)
@@ -331,7 +331,7 @@

         if(code != CHKInsertSender.TIMED_OUT && code != 
CHKInsertSender.GENERATED_REJECTED_OVERLOAD && 
                        code != CHKInsertSender.INTERNAL_ERROR && code != 
CHKInsertSender.ROUTE_REALLY_NOT_FOUND &&
-                       code != CHKInsertSender.RECEIVE_FAILED) {
+                       code != CHKInsertSender.RECEIVE_FAILED && 
!receiveFailed) {
                int totalSent = getTotalSentBytes();
                int totalReceived = getTotalReceivedBytes();
                if(sender != null) {
@@ -341,7 +341,7 @@
                if(logMINOR) Logger.minor(this, "Remote CHK insert cost 
"+totalSent+ '/' +totalReceived+" bytes ("+code+ ") receive failed = 
"+sender.failedReceive());
                
node.nodeStats.remoteChkInsertBytesSentAverage.report(totalSent);
                
node.nodeStats.remoteChkInsertBytesReceivedAverage.report(totalReceived);
-               if(code == CHKInsertSender.SUCCESS && !(sender != null && 
sender.failedReceive())) {
+               if(code == CHKInsertSender.SUCCESS) {
                        // Report both sent and received because we have both a 
Handler and a Sender
                        
node.nodeStats.successfulChkInsertBytesSentAverage.report(totalSent);
                        
node.nodeStats.successfulChkInsertBytesReceivedAverage.report(totalReceived);