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

[t...@freenetproject.org]

Author: toad
Date: 2008-09-12 17:39:26 +0000 (Fri, 12 Sep 2008)
New Revision: 22631

Modified:
   trunk/freenet/src/freenet/node/updater/UpdateOverMandatoryManager.java
Log:
Possibly fix some updater bugs.
Needs testing!


Modified: trunk/freenet/src/freenet/node/updater/UpdateOverMandatoryManager.java
===================================================================
--- trunk/freenet/src/freenet/node/updater/UpdateOverMandatoryManager.java      
2008-09-12 17:08:44 UTC (rev 22630)
+++ trunk/freenet/src/freenet/node/updater/UpdateOverMandatoryManager.java      
2008-09-12 17:39:26 UTC (rev 22631)
@@ -273,6 +273,7 @@
        private void sendUOMRequestMain(final PeerNode source, boolean 
addOnFail) {
                if(logMINOR)
                        Logger.minor(this, 
"sendUOMRequestMain("+source+","+addOnFail+")");
+               if(!source.isConnected()) return;
                synchronized(this) {
                        long offeredVersion = source.getMainJarOfferedVersion();
                        if(offeredVersion < updateManager.newMainJarVersion()) {
@@ -365,6 +366,7 @@
                                                        >= 
MAX_NODES_SENDING_MAIN_JAR)
                                                return;
                                        
if(nodesSendingMainJar.contains(offers[i])) continue;
+                                       
if(nodesAskedSendMainJar.contains(offers[i])) continue;
                                }
                                sendUOMRequestMain(offers[i], false);
                        }