From: Timo Sirainen <tss@iki.fi>
Date: Thu, 4 Aug 2011 12:49:49 +0000 (+0300)
Subject: fts-lucene: Fixed checking if we need to track expunges or optimize.
X-Git-Tag: 2.1.alpha1~176
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a6de00f8d3f65335149f6fe828fca9da6328d42a;p=thirdparty%2Fdovecot%2Fcore.git

fts-lucene: Fixed checking if we need to track expunges or optimize.
---

diff --git a/src/plugins/fts-lucene/fts-backend-lucene.c b/src/plugins/fts-lucene/fts-backend-lucene.c
index fcd35dfbb0..9c77e41b4b 100644
--- a/src/plugins/fts-lucene/fts-backend-lucene.c
+++ b/src/plugins/fts-lucene/fts-backend-lucene.c
@@ -187,7 +187,8 @@ fts_backend_lucene_need_optimize(struct lucene_fts_backend_update_context *ctx)
 	if (ctx->expunges == 0)
 		return FALSE;
 
-	if (lucene_index_get_doc_count(backend->index, &numdocs) < 0)
+	if (lucene_index_get_doc_count(backend->index, &numdocs) < 0 ||
+	    numdocs == 0)
 		return FALSE;
 
 	/* update pending expunges count */
diff --git a/src/plugins/fts-lucene/lucene-wrapper.cc b/src/plugins/fts-lucene/lucene-wrapper.cc
index 2c3affefec..0c12ba5fcc 100644
--- a/src/plugins/fts-lucene/lucene-wrapper.cc
+++ b/src/plugins/fts-lucene/lucene-wrapper.cc
@@ -224,7 +224,8 @@ int lucene_index_get_doc_count(struct lucene_index *index, uint32_t *count_r)
 			return 0;
 		}
 	}
-	return index->reader->numDocs();
+	*count_r = index->reader->numDocs();
+	return 0;
 }
 
 int lucene_index_build_init(struct lucene_index *index)