From cbc73a6e8d6525430aded73048c04d034a098a59 Mon Sep 17 00:00:00 2001
From: Barbara Miller <galgeek@me.com>
Date: Thu, 21 Jul 2016 11:40:58 -0700
Subject: [PATCH] check controller state, not frontier.isEmpty)

---
 .../java/org/archive/modules/AMQPUrlWaiter.java   | 15 ++-------------
 1 file changed, 2 insertions(+), 13 deletions(-)

diff --git a/contrib/src/main/java/org/archive/modules/AMQPUrlWaiter.java b/contrib/src/main/java/org/archive/modules/AMQPUrlWaiter.java
index 86c79631..764e775b 100644
--- a/contrib/src/main/java/org/archive/modules/AMQPUrlWaiter.java
+++ b/contrib/src/main/java/org/archive/modules/AMQPUrlWaiter.java
@@ -27,7 +27,6 @@ import org.archive.crawler.event.AMQPUrlReceivedEvent;
 import org.archive.crawler.event.StatSnapshotEvent;
 import org.archive.crawler.framework.CrawlController;
 import org.archive.crawler.framework.CrawlStatus;
-import org.archive.crawler.framework.Frontier;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.ApplicationEvent;
 import org.springframework.context.ApplicationListener;
@@ -55,16 +54,6 @@ public class AMQPUrlWaiter implements ApplicationListener<ApplicationEvent> {
         this.controller = controller;
     }
 
-    protected Frontier frontier;
-    public Frontier getFrontier() {
-        return this.frontier;
-    }
-    /** Autowired frontier, needed to determine when a url is finished. */
-    @Autowired
-    public void setFrontier(Frontier frontier) {
-        this.frontier = frontier;
-    }
-
     @Override
     public void onApplicationEvent(ApplicationEvent event) {
         if (event instanceof AMQPUrlPublishedEvent) {
@@ -77,8 +66,8 @@ public class AMQPUrlWaiter implements ApplicationListener<ApplicationEvent> {
     }
 
     protected void checkAMQPUrlWait() {
-        if (frontier.isEmpty() && (urlsPublished == 0 || urlsReceived > 0)) {
-            logger.info("frontier is empty and we have received " + urlsReceived +
+        if (controller.getState() == CrawlController.State.EMPTY && (urlsPublished == 0 || urlsReceived > 0)) {
+            logger.info("crawl controller state is empty and we have received " + urlsReceived +
                         " urls from AMQP, and published " + urlsPublished +
                         ", stopping crawl with status " + CrawlStatus.FINISHED);
             controller.requestCrawlStop(CrawlStatus.FINISHED);