Author: toad
Date: 2008-07-17 21:32:44 +0000 (Thu, 17 Jul 2008)
New Revision: 21188
Modified:
branches/db4o/freenet/src/freenet/client/async/ClientRequestSchedulerCore.java
Log:
Use and().
Modified:
branches/db4o/freenet/src/freenet/client/async/ClientRequestSchedulerCore.java
===================================================================
---
branches/db4o/freenet/src/freenet/client/async/ClientRequestSchedulerCore.java
2008-07-17 21:32:14 UTC (rev 21187)
+++
branches/db4o/freenet/src/freenet/client/async/ClientRequestSchedulerCore.java
2008-07-17 21:32:44 UTC (rev 21188)
@@ -155,6 +155,9 @@
// });
Query query = container.query();
query.constrain(RegisterMe.class);
+ // This throws NotSupported.
+//
query.descend("core").constrain(this).identity().
+//
and(query.descend("key").descend("addedTime").constrain(new
Long(initTime)).smaller());
/**
* FIXME DB4O
* db4o says it has indexed core. But then when
we try to query, it produces a diagnostic
@@ -720,8 +723,7 @@
// });
Query query = container.query();
query.constrain(PendingKeyItem.class);
- query.descend("fullKeyAsBytes").constrain(pks);
- query.descend("nodeDBHandle").constrain(new Long(nodeDBHandle));
+
query.descend("fullKeyAsBytes").constrain(pks).and(query.descend("nodeDBHandle").constrain(new
Long(nodeDBHandle)));
Evaluation eval = new Evaluation() {
public void evaluate(Candidate candidate) {
