[freenet-cvs] r21199 - branches/db4o/freenet/src/freenet/client

[t...@freenetproject.org]

Author: toad
Date: 2008-07-17 22:21:19 +0000 (Thu, 17 Jul 2008)
New Revision: 21199

Modified:
   branches/db4o/freenet/src/freenet/client/FECQueue.java
Log:
and() here

Modified: branches/db4o/freenet/src/freenet/client/FECQueue.java
===================================================================
--- branches/db4o/freenet/src/freenet/client/FECQueue.java      2008-07-17 
22:18:39 UTC (rev 21198)
+++ branches/db4o/freenet/src/freenet/client/FECQueue.java      2008-07-17 
22:21:19 UTC (rev 21199)
@@ -9,6 +9,7 @@

 import com.db4o.ObjectContainer;
 import com.db4o.ObjectSet;
+import com.db4o.query.Constraint;
 import com.db4o.query.Predicate;
 import com.db4o.query.Query;

@@ -236,8 +237,8 @@
                                        if(logMINOR) Logger.minor(this, 
"Grabbing up to "+grab+" jobs at priority "+prio);
                                        Query query = container.query();
                                        query.constrain(FECJob.class);
-                                       query.descend("priority").constrain(new 
Short(prio));
-                                       
query.descend("queue").constrain(FECQueue.this);
+                                       Constraint con = 
query.descend("priority").constrain(new Short(prio));
+                                       
con.and(query.descend("queue").constrain(FECQueue.this));
                                        
query.descend("addedTime").orderAscending();
                                        ObjectSet results = query.execute();
                                        if(results.hasNext()) {