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

[zot...@freenetproject.org]

Author: zothar
Date: 2006-09-08 03:27:22 +0000 (Fri, 08 Sep 2006)
New Revision: 10427

Modified:
   trunk/freenet/src/freenet/node/PeerNode.java
Log:
On sending a queued N2NTM, remove it from the queue rather than adding it.

Modified: trunk/freenet/src/freenet/node/PeerNode.java
===================================================================
--- trunk/freenet/src/freenet/node/PeerNode.java        2006-09-08 02:49:20 UTC 
(rev 10426)
+++ trunk/freenet/src/freenet/node/PeerNode.java        2006-09-08 03:27:22 UTC 
(rev 10427)
@@ -2666,11 +2666,11 @@
                                Message n2ntm = 
DMT.createNodeToNodeTextMessage(Node.N2N_TEXT_MESSAGE_TYPE_USERALERT, 
source_nodename, target_nodename, text);
                                try {
                                        node.usm.send(this, n2ntm, null);
-                                       Logger.normal(this, "Sent N2NTM to 
'"+getName()+"': "+text);
+                                       Logger.normal(this, "Sent queued 
("+fileNumber+") N2NTM to '"+getName()+"': "+text);
                                        sendSuccess = true;
                                        
synchronized(queuedToSendN2NTMExtraPeerDataFileNumbers) {
                                                
if(queuedToSendN2NTMExtraPeerDataFileNumbers.contains(new Integer(fileNumber))) 
{
-                                                       
queuedToSendN2NTMExtraPeerDataFileNumbers.addElement(new Integer(fileNumber));
+                                                       
queuedToSendN2NTMExtraPeerDataFileNumbers.removeElement(new 
Integer(fileNumber));
                                                }
                                        }
                                        deleteExtraPeerDataFile(fileNumber);