From: Marco Bettini <marco.bettini@open-xchange.com>
Date: Fri, 14 Apr 2023 13:04:07 +0000 (+0000)
Subject: fts-solr: fts_backend_solr_update_deinit() Avoid double commit
X-Git-Tag: 2.4.0~2795
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0cda97918e9d3e8ab37680ad36cabe4ad7839b8a;p=thirdparty%2Fdovecot%2Fcore.git

fts-solr: fts_backend_solr_update_deinit() Avoid double commit

Soft-commit is already handled in fts_backend_solr_update_set_mailbox(),
except for the expunges.
---

diff --git a/src/plugins/fts-solr/fts-backend-solr.c b/src/plugins/fts-solr/fts-backend-solr.c
index b3580a6ebb..ce147c80f1 100644
--- a/src/plugins/fts-solr/fts-backend-solr.c
+++ b/src/plugins/fts-solr/fts-backend-solr.c
@@ -408,11 +408,8 @@ fts_backend_solr_update_deinit(struct fts_backend_update_context *_ctx)
 	if (fts_backed_solr_build_flush(ctx) < 0)
 		ret = -1;
 
-	if (ctx->documents_added || ctx->expunges) {
-		/* commit and wait until the documents we just indexed are
-		   visible to the following search */
-		if (ctx->expunges)
-			fts_backend_solr_expunge_flush(ctx);
+	if (ctx->expunges) {
+		fts_backend_solr_expunge_flush(ctx);
 		if (fts_backend_solr_commit(ctx) < 0)
 			ret = -1;
 	}