Author: toad
Date: 2008-04-11 13:29:26 +0000 (Fri, 11 Apr 2008)
New Revision: 19177

Modified:
   trunk/freenet/src/freenet/node/PacketSender.java
Log:
Check a bit earlier, so we remove seednodes even if we've disconnected from 
them.

Modified: trunk/freenet/src/freenet/node/PacketSender.java
===================================================================
--- trunk/freenet/src/freenet/node/PacketSender.java    2008-04-11 11:59:31 UTC 
(rev 19176)
+++ trunk/freenet/src/freenet/node/PacketSender.java    2008-04-11 13:29:26 UTC 
(rev 19177)
@@ -209,6 +209,10 @@
                        lastReceivedPacketFromAnyNode =
                                Math.max(pn.lastReceivedPacketTime(), 
lastReceivedPacketFromAnyNode);
                        pn.maybeOnConnect();
+                       if(pn.shouldDisconnectAndRemoveNow() && 
!pn.isDisconnecting()) {
+                               node.peers.disconnect(pn, true, false);
+                       }
+
                        if(pn.isConnected()) {
                                // Is the node dead?
                                if(now - pn.lastReceivedPacketTime() > 
pn.maxTimeBetweenReceivedPackets()) {
@@ -228,10 +232,6 @@
                                        continue;
                                }

-                               if(pn.shouldDisconnectAndRemoveNow() && 
!pn.isDisconnecting()) {
-                                       node.peers.disconnect(pn, true, false);
-                               }
-
                                boolean mustSend = false;

                                // Any urgent notifications to send?


Reply via email to