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

[t...@freenetproject.org]

Author: toad
Date: 2007-07-14 21:12:40 +0000 (Sat, 14 Jul 2007)
New Revision: 14129

Modified:
   trunk/freenet/src/freenet/node/OpennetManager.java
Log:
dropList could be empty, in which case we don't want to update timeLastDropped

Modified: trunk/freenet/src/freenet/node/OpennetManager.java
===================================================================
--- trunk/freenet/src/freenet/node/OpennetManager.java  2007-07-14 21:01:55 UTC 
(rev 14128)
+++ trunk/freenet/src/freenet/node/OpennetManager.java  2007-07-14 21:12:40 UTC 
(rev 14129)
@@ -261,7 +261,8 @@
                                                        
peersLRU.push(nodeToAddNow);
                                                if(logMINOR) Logger.minor(this, 
"Added opennet peer "+nodeToAddNow+" after clearing "+dropList.size()+" 
items");                                        
                                        }
-                                       timeLastDropped = now;
+                                       if(!dropList.isEmpty())
+                                               timeLastDropped = now;
                                } else {
                                        if(now - timeLastOffered <= 
MIN_TIME_BETWEEN_OFFERS && !hasDisconnected) {
                                                if(logMINOR)
@@ -269,7 +270,8 @@
                                                // Cancel
                                                ret = false;
                                        } else {
-                                               timeLastDropped = now;
+                                               if(!dropList.isEmpty())
+                                                       timeLastDropped = now;
                                                timeLastOffered = now;
                                        }
                                }