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

[t...@freenetproject.org]

Author: toad
Date: 2007-04-14 20:31:55 +0000 (Sat, 14 Apr 2007)
New Revision: 12721

Modified:
   trunk/freenet/src/freenet/node/CHKInsertSender.java
   trunk/freenet/src/freenet/node/InsertHandler.java
Log:
Don't report sent bytes if we didn't send any

Modified: trunk/freenet/src/freenet/node/CHKInsertSender.java
===================================================================
--- trunk/freenet/src/freenet/node/CHKInsertSender.java 2007-04-14 20:25:54 UTC 
(rev 12720)
+++ trunk/freenet/src/freenet/node/CHKInsertSender.java 2007-04-14 20:31:55 UTC 
(rev 12721)
@@ -845,4 +845,8 @@
        public boolean failedReceive() {
                return receiveFailed;
        }
+
+       public synchronized boolean startedSendingData() {
+               return cw != null;
+       }
 }

Modified: trunk/freenet/src/freenet/node/InsertHandler.java
===================================================================
--- trunk/freenet/src/freenet/node/InsertHandler.java   2007-04-14 20:25:54 UTC 
(rev 12720)
+++ trunk/freenet/src/freenet/node/InsertHandler.java   2007-04-14 20:31:55 UTC 
(rev 12721)
@@ -353,7 +353,8 @@
                
node.nodeStats.remoteChkInsertBytesReceivedAverage.report(totalReceived);
                if(code == CHKInsertSender.SUCCESS) {
                        // Report both sent and received because we have both a 
Handler and a Sender
-                       
node.nodeStats.successfulChkInsertBytesSentAverage.report(totalSent);
+                       if(sender.startedSendingData())
+                               
node.nodeStats.successfulChkInsertBytesSentAverage.report(totalSent);
                        
node.nodeStats.successfulChkInsertBytesReceivedAverage.report(totalReceived);
                }
         }