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

[t...@freenetproject.org]

Author: toad
Date: 2008-09-23 19:11:18 +0000 (Tue, 23 Sep 2008)
New Revision: 22782

Modified:
   trunk/freenet/src/freenet/node/PeerMessageQueue.java
Log:
Fix mustSendSize(). We were sending too many packets because of adding maxSize 
and then comparing with it, this should restore coalescing.


Modified: trunk/freenet/src/freenet/node/PeerMessageQueue.java
===================================================================
--- trunk/freenet/src/freenet/node/PeerMessageQueue.java        2008-09-23 
19:09:32 UTC (rev 22781)
+++ trunk/freenet/src/freenet/node/PeerMessageQueue.java        2008-09-23 
19:11:18 UTC (rev 22782)
@@ -105,9 +105,10 @@
                for(LinkedList items : queuesByPriority) {
                        for(Object o : items) {
                                MessageItem i = (MessageItem) o;
-                               if(length + maxSize > maxSize) {
+                               int thisSize = i.getLength();
+                               if(length + thisSize > maxSize) {
                                        return true;
-                               } else length += maxSize;
+                               } else length += thisSize;
                        }
                }
                return false;