Author: j16sdiz
Date: 2009-04-15 06:34:35 +0000 (Wed, 15 Apr 2009)
New Revision: 26826
Modified:
trunk/freenet/src/freenet/node/PacketTracker.java
Log:
Move code out of synchronized()
Modified: trunk/freenet/src/freenet/node/PacketTracker.java
===================================================================
--- trunk/freenet/src/freenet/node/PacketTracker.java 2009-04-15 06:34:14 UTC
(rev 26825)
+++ trunk/freenet/src/freenet/node/PacketTracker.java 2009-04-15 06:34:35 UTC
(rev 26826)
@@ -907,18 +907,20 @@
earliestTime = qa.urgentTime;
}
}
+ PacketActionItem qr = null;
synchronized(resendRequestQueue) {
- if(!resendRequestQueue.isEmpty()) {
- QueuedResendRequest qr =
resendRequestQueue.getLowest();
- earliestTime = Math.min(earliestTime,
qr.urgentTime);
- }
+ if(!resendRequestQueue.isEmpty())
+ qr = resendRequestQueue.getLowest();
}
+ if (qr != null);
+ earliestTime = Math.min(earliestTime, qr.urgentTime);
+
synchronized(ackRequestQueue) {
- if(!ackRequestQueue.isEmpty()) {
- QueuedAckRequest qr =
ackRequestQueue.getLowest();
- earliestTime = Math.min(earliestTime,
qr.urgentTime);
- }
+ if(!ackRequestQueue.isEmpty())
+ qr = ackRequestQueue.getLowest();
}
+ if (qr != null);
+ earliestTime = Math.min(earliestTime, qr.urgentTime);
return earliestTime;
}
_______________________________________________
cvs mailing list
[email protected]
http://emu.freenetproject.org/cgi-bin/mailman/listinfo/cvs
