[freenet-cvs] r10044 - trunk/freenet/src/freenet/clients/http

[t...@freenetproject.org]

Author: toad
Date: 2006-08-12 14:35:55 +0000 (Sat, 12 Aug 2006)
New Revision: 10044

Modified:
   trunk/freenet/src/freenet/clients/http/QueueToadlet.java
Log:
Sort queue by priority first, then identifier.

Modified: trunk/freenet/src/freenet/clients/http/QueueToadlet.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/QueueToadlet.java    2006-08-12 
00:24:31 UTC (rev 10043)
+++ trunk/freenet/src/freenet/clients/http/QueueToadlet.java    2006-08-12 
14:35:55 UTC (rev 10044)
@@ -28,7 +28,6 @@
 import freenet.support.Logger;
 import freenet.support.MultiValueTable;
 import freenet.support.SizeUtil;
-import freenet.support.URLEncoder;
 import freenet.support.io.Bucket;
 import freenet.support.io.BucketTools;
 import freenet.support.io.FileBucket;
@@ -287,6 +286,10 @@
                        public int compare(Object first, Object second) {
                                ClientRequest firstRequest = (ClientRequest) 
first;
                                ClientRequest secondRequest = (ClientRequest) 
second;
+                               short firstPrio = firstRequest.getPriority();
+                               short secondPrio = secondRequest.getPriority();
+                               if(firstPrio > secondPrio) return 1;
+                               if(secondPrio > firstPrio) return -1;
                                return 
firstRequest.getIdentifier().compareTo(secondRequest.getIdentifier());
                        }
                };