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

[t...@freenetproject.org]

Author: toad
Date: 2007-06-15 18:46:36 +0000 (Fri, 15 Jun 2007)
New Revision: 13611

Modified:
   trunk/freenet/src/freenet/node/PacketSender.java
   trunk/freenet/src/freenet/node/PeerNode.java
Log:
Add message to outgoing column only once, not once per send attempt

Modified: trunk/freenet/src/freenet/node/PacketSender.java
===================================================================
--- trunk/freenet/src/freenet/node/PacketSender.java    2007-06-15 18:37:48 UTC 
(rev 13610)
+++ trunk/freenet/src/freenet/node/PacketSender.java    2007-06-15 18:46:36 UTC 
(rev 13611)
@@ -265,9 +265,6 @@
                        } else {
                                for(int j=0;j<messages.length;j++) {
                                        if(logMINOR) Logger.minor(this, "PS 
Sending: "+(messages[j].msg == null ? "(not a Message)" : 
messages[j].msg.getSpec().getName()));
-                                       if (messages[j].msg != null) {
-                                               
pn.addToLocalNodeSentMessagesToStatistic(messages[j].msg);
-                                       }
                                }
                                // Send packets, right now, blocking, including 
any active notifications
                                
node.packetMangler.processOutgoingOrRequeue(messages, pn, true, false);

Modified: trunk/freenet/src/freenet/node/PeerNode.java
===================================================================
--- trunk/freenet/src/freenet/node/PeerNode.java        2007-06-15 18:37:48 UTC 
(rev 13610)
+++ trunk/freenet/src/freenet/node/PeerNode.java        2007-06-15 18:46:36 UTC 
(rev 13611)
@@ -954,6 +954,7 @@
     public void sendAsync(Message msg, AsyncMessageCallback cb, int 
alreadyReportedBytes, ByteCounter ctr) throws NotConnectedException {
        if(logMINOR) Logger.minor(this, "Sending async: "+msg+" : "+cb+" on 
"+this);
         if(!isConnected()) throw new NotConnectedException();
+               addToLocalNodeSentMessagesToStatistic(msg);
         MessageItem item = new MessageItem(msg, cb == null ? null : new 
AsyncMessageCallback[] {cb}, alreadyReportedBytes, ctr);
         item.getData(this);
         long now = System.currentTimeMillis();