Author: toad
Date: 2008-11-14 17:30:54 +0000 (Fri, 14 Nov 2008)
New Revision: 23582
Modified:
trunk/freenet/src/freenet/node/PeerNode.java
Log:
Doh - don't check wouldBlock here
Modified: trunk/freenet/src/freenet/node/PeerNode.java
===================================================================
--- trunk/freenet/src/freenet/node/PeerNode.java 2008-11-14 15:44:43 UTC
(rev 23581)
+++ trunk/freenet/src/freenet/node/PeerNode.java 2008-11-14 17:30:54 UTC
(rev 23582)
@@ -1263,30 +1263,27 @@
prev = previousTracker;
}
KeyTracker kt = cur;
- try {
- if(kt != null && !kt.wouldBlock(false)) {
+ if(kt != null) {
long next = kt.getNextUrgentTime();
t = Math.min(t, next);
if(next < now && logMINOR)
Logger.minor(this, "Next urgent time from
curTracker less than now");
if(kt.hasPacketsToResend()) return now;
}
- } catch (BlockedTooLongException e) {
- // Ignore for now, it will come back around
- }
kt = prev;
- try {
- if(kt != null && !kt.wouldBlock(false)) {
+ if(kt != null) {
long next = kt.getNextUrgentTime();
t = Math.min(t, next);
if(next < now && logMINOR)
Logger.minor(this, "Next urgent time from
prevTracker less than now");
if(kt.hasPacketsToResend()) return now;
}
+ try {
+ if(!cur.wouldBlock(false))
+ t = messageQueue.getNextUrgentTime(t, now);
} catch (BlockedTooLongException e) {
// Ignore for now, it will come back around
}
- t = messageQueue.getNextUrgentTime(t, now);
return t;
}
_______________________________________________
cvs mailing list
[email protected]
http://emu.freenetproject.org/cgi-bin/mailman/listinfo/cvs
