Merge pull request #659 from internetarchive/adam/handle-bdb-shutdown-interrupts

fix: handle bdb shutdown interrupts

Author: ato

commons/src/main/java/org/archive/bdb/StoredQueue.java

@@ -93,6 +93,7 @@ public Iterator<E> iterator() {
     @Override
     public int size() {
         try {
+            Thread.interrupted();
             return Math.max(0, 
                     (int)(tailIndex.get() 
                           - queueMap.firstKey())); 

engine/src/main/java/org/archive/crawler/framework/CrawlController.java

@@ -423,7 +423,8 @@ private boolean shouldContinueCrawling() {
     public synchronized void requestCrawlStop() {
         if(state == State.STOPPING) {
             // second stop request; nudge the threads with interrupts
-            getToePool().cleanup();
+            if (getToePool() != null)
+                getToePool().cleanup();
         }
         requestCrawlStop(CrawlStatus.ABORTED);
     }

modules/src/main/java/org/archive/modules/fetcher/BdbCookieStore.java

@@ -134,7 +134,7 @@ public void addCookieImpl(Cookie cookie) {
         } catch (UnsupportedEncodingException e) {
             throw new RuntimeException(e); // impossible
         }
-
+        Thread.interrupted();
         if (!cookie.isExpired(new Date())) {
             cookies.put(key, cookie);
         } else {
@@ -144,7 +144,7 @@ public void addCookieImpl(Cookie cookie) {
 
     public boolean expireCookie(Cookie cookie, Date date) {
         byte[] key = sortableKey(cookie).getBytes(StandardCharsets.UTF_8);
-
+        Thread.interrupted();
         if (cookie.isExpired(date)) {
             cookies.remove(key);
             return true;
@@ -160,6 +160,7 @@ protected Collection<Cookie> hostSubset(String host) {
             char chAfterDelim = (char)(((int)';')+1); 
             byte[] endKey = (host + chAfterDelim).getBytes("UTF-8");
 
+            Thread.interrupted();
             SortedMap<byte[], Cookie> submap = cookies.subMap(startKey, endKey);
             return submap.values();
 
@@ -225,6 +226,7 @@ public void setRecoveryCheckpoint(Checkpoint recoveryCheckpoint) {
 
     @Override
     public void clear() {
+        Thread.interrupted();
         cookies.clear();
     }
 
@@ -234,6 +236,7 @@ public void clear() {
     @Override
     public List<Cookie> getCookies() {
         if (cookies != null) {
+            Thread.interrupted();
             return new RestrictedCollectionWrappedList<Cookie>(cookies.values());
         } else {
             return null;