From: Aki Tuomi <aki.tuomi@open-xchange.com>
Date: Mon, 29 Apr 2019 11:07:19 +0000 (+0300)
Subject: fts-solr: Only increment ctx->mails_since_flush after flush
X-Git-Tag: 2.3.6~5
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=010a1e9917a4ce99ad08537349de80792e1a9257;p=thirdparty%2Fdovecot%2Fcore.git

fts-solr: Only increment ctx->mails_since_flush after flush

Otherwise it gets wrongly increment before flush.
---

diff --git a/src/plugins/fts-solr/fts-backend-solr.c b/src/plugins/fts-solr/fts-backend-solr.c
index 101a7faae4..ea698a81af 100644
--- a/src/plugins/fts-solr/fts-backend-solr.c
+++ b/src/plugins/fts-solr/fts-backend-solr.c
@@ -494,10 +494,11 @@ fts_backend_solr_uid_changed(struct solr_fts_backend_update_context *ctx,
 	struct solr_fts_backend *backend =
 		(struct solr_fts_backend *)ctx->ctx.backend;
 
-	if (ctx->mails_since_flush++ >= SOLR_MAIL_FLUSH_INTERVAL) {
+	if (ctx->mails_since_flush >= SOLR_MAIL_FLUSH_INTERVAL) {
 		if (fts_backed_solr_build_flush(ctx) < 0)
 			ctx->ctx.failed = TRUE;
 	}
+	ctx->mails_since_flush++;
 	if (ctx->post == NULL) {
 		if (ctx->cmd == NULL)
 			ctx->cmd = str_new(default_pool, SOLR_CMDBUF_SIZE);