[freenet-cvs] r17304 - trunk/freenet/src/freenet/node/updater

[t...@freenetproject.org]

Author: toad
Date: 2008-01-26 17:27:49 +0000 (Sat, 26 Jan 2008)
New Revision: 17304

Modified:
   trunk/freenet/src/freenet/node/updater/UpdateOverMandatoryManager.java
Log:
Don't ask the same node for the main jar until after the timeout!
See bug #2016 !

Modified: trunk/freenet/src/freenet/node/updater/UpdateOverMandatoryManager.java
===================================================================
--- trunk/freenet/src/freenet/node/updater/UpdateOverMandatoryManager.java      
2008-01-26 17:26:04 UTC (rev 17303)
+++ trunk/freenet/src/freenet/node/updater/UpdateOverMandatoryManager.java      
2008-01-26 17:27:49 UTC (rev 17304)
@@ -223,6 +223,10 @@

        protected void sendUOMRequestMain(final PeerNode source, boolean 
addOnFail) {
                synchronized(this) {
+                       if(nodesAskedSendMainJar.contains(source)) {
+                               if(logMINOR) Logger.minor(this, "Recently asked 
node "+source+" so not re-asking yet.");
+                               return;
+                       }
                        if(addOnFail && nodesAskedSendMainJar.size() + 
nodesSendingMainJar.size() >= MAX_NODES_SENDING_MAIN_JAR) {
                                if(nodesOfferedMainJar.add(source)) {
                                        System.err.println("Offered main jar by 
"+source.userToString()+" (already fetching from 
"+nodesSendingMainJar.size()+"), but will use this offer if our current fetches 
fail).");