From d3475fadbf5c682cd755c7c2a46d0b86ae5169d2 Mon Sep 17 00:00:00 2001 From: nlevitt Date: Mon, 20 Jun 2011 18:06:41 +0000 Subject: [PATCH] * BdbMultipleWorkQueues.java getFrom() - support null marker to start from first key, as appeared to be the intention --- .../org/archive/crawler/frontier/BdbMultipleWorkQueues.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/engine/src/main/java/org/archive/crawler/frontier/BdbMultipleWorkQueues.java b/engine/src/main/java/org/archive/crawler/frontier/BdbMultipleWorkQueues.java index 957ec3cb..c1846c80 100644 --- a/engine/src/main/java/org/archive/crawler/frontier/BdbMultipleWorkQueues.java +++ b/engine/src/main/java/org/archive/crawler/frontier/BdbMultipleWorkQueues.java @@ -140,7 +140,7 @@ public class BdbMultipleWorkQueues { } /** - * @param m marker + * @param m marker or null to start with first entry * @param maxMatches * @return list of matches starting from marker position * @throws DatabaseException @@ -154,12 +154,12 @@ public class BdbMultipleWorkQueues { int matches = 0; int tries = 0; ArrayList results = new ArrayList(maxMatches); - byte[] marker = m.getBytes(); // = FrontierJMXTypes.fromString(m); DatabaseEntry key; - if (marker == null) { + if (m == null) { key = getFirstKey(); } else { + byte[] marker = m.getBytes(); // = FrontierJMXTypes.fromString(m); key = new DatabaseEntry(marker); }