Add state checks

diff --git a/etc/afpd/spotlight.c b/etc/afpd/spotlight.c
index 60d3679ae6b554f0251f160d10985da925e1b53f..b5340b6a9049fd4c4d1b6a241518ec14a6cbe9f2 100644 (file)
--- a/etc/afpd/spotlight.c
+++ b/etc/afpd/spotlight.c
@@ -286,8 +286,8 @@ static int sl_rpc_fetchQueryResultsForContext(const AFPObj *obj, const DALLOC_CT
 
     /* Get query for context */
     EC_NULL_LOG( slq = slq_for_ctx(ctx1, ctx2) );
-    if (slq->slq_state != SLQ_STATE_RUNNING) {
-        EC_FAIL_LOG("Spotlight: attempt to fetch results for query that isn't runnnig");
+    if (slq->slq_state != SLQ_STATE_RUNNING && slq->slq_state != SLQ_STATE_DONE) {
+        EC_FAIL_LOG("Spotlight: attempt to fetch results for query that isn't active");
     }
 
     /* Create and pass reply handle */
@@ -296,8 +296,10 @@ static int sl_rpc_fetchQueryResultsForContext(const AFPObj *obj, const DALLOC_CT
     dalloc_add_copy(array, &sl_res, uint64_t);
     slq->slq_reply = array;
 
-    /* Fetch Tracker results*/
-    EC_ZERO( sl_module_export->sl_mod_fetch_result(slq) );
+    if (slq->slq_state == SLQ_STATE_RUNNING) {
+        /* Fetch Tracker results*/
+        EC_ZERO( sl_module_export->sl_mod_fetch_result(slq) );
+    }
 
     dalloc_add(reply, array, sl_array_t);
 

diff --git a/etc/afpd/spotlight_module.c b/etc/afpd/spotlight_module.c
index 41ae4bd18ced31abaf3bdc1473a2a5754b6061e8..f5321cd1fe80d56139640bad5b3881bba53091ad 100644 (file)
--- a/etc/afpd/spotlight_module.c
+++ b/etc/afpd/spotlight_module.c
@@ -244,6 +244,8 @@ static int sl_mod_fetch_result(void *p)
         EC_FAIL;
     }
 
+    slq->slq_state = SLQ_STATE_DONE;
+
     dalloc_add(slq->slq_reply, cnids, sl_cnids_t);
     dalloc_add(slq->slq_reply, fm, sl_filemeta_t);