From be81d3733a59bbb65c5d82d4ef08d6f645a3286c Mon Sep 17 00:00:00 2001
From: nlevitt <nlevitt@daa5b2f2-a927-0410-8b2d-f5f262fa301a>
Date: Wed, 18 Nov 2009 03:02:28 +0000
Subject: [PATCH] [HER-1710] on problem loading persist log, close reader

---
 .../org/archive/modules/recrawl/PersistProcessor.java | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/modules/src/main/java/org/archive/modules/recrawl/PersistProcessor.java b/modules/src/main/java/org/archive/modules/recrawl/PersistProcessor.java
index d61f5ed8..7cc61592 100644
--- a/modules/src/main/java/org/archive/modules/recrawl/PersistProcessor.java
+++ b/modules/src/main/java/org/archive/modules/recrawl/PersistProcessor.java
@@ -202,10 +202,17 @@ public abstract class PersistProcessor extends Processor {
                 logger.fine(splits[0] + " " + ArchiveUtils.prettyString(alist));
             }
 
-            if (historyMap != null) {
-                // XXX allow RuntimeExceptions to propagate
+            if (historyMap != null) try {
                 historyMap.put(splits[0], alist);
+            } catch (Exception e) {
+                logger.log(Level.SEVERE, "caught exception after loading " + count + 
+                        " urls from the persist log (perhaps crawl was stopped by user?)", e);
+                IOUtils.closeQuietly(persistLogReader);
+
+                // seems to finish most cleanly when we return rather than throw something
+                return count;
             }
+
             count++;
         }
         IOUtils.closeQuietly(persistLogReader);