Author: toad
Date: 2008-04-10 14:35:04 +0000 (Thu, 10 Apr 2008)
New Revision: 19139

Modified:
   trunk/freenet/src/freenet/node/Announcer.java
Log:
Better... don't kill the announce unless we can update, but we're not updating 
because the user hasn't armed us.

Modified: trunk/freenet/src/freenet/node/Announcer.java
===================================================================
--- trunk/freenet/src/freenet/node/Announcer.java       2008-04-10 14:28:55 UTC 
(rev 19138)
+++ trunk/freenet/src/freenet/node/Announcer.java       2008-04-10 14:35:04 UTC 
(rev 19139)
@@ -259,8 +259,8 @@
                        }
                        return true;
                }
-               if(node.nodeUpdater == null || (!node.nodeUpdater.isEnabled()) 
|| 
-                               node.nodeUpdater.canUpdateNow()) {
+               if(node.nodeUpdater == null || (!node.nodeUpdater.isEnabled()) 
||
+                               (node.nodeUpdater.canUpdateNow() && 
!node.nodeUpdater.isArmed())) {
                        // If we also have 10 TOO_NEW peers, we should shut 
down the announcement,
                        // because we're obviously broken and would only be 
spamming the seednodes.
                        
if(node.peers.getPeerNodeStatusSize(PeerManager.PEER_NODE_STATUS_TOO_NEW, true) 
+


Reply via email to