dbox: Revert cache changes if some save/copy fails but transaction is…

… committed.
dovecot · May 27, 2016 · c866a03 · c866a03
1 parent f819faf
commit c866a03
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 0 deletions.
diff --git a/src/lib-storage/index/dbox-multi/mdbox-save.c b/src/lib-storage/index/dbox-multi/mdbox-save.c
@@ -216,6 +216,7 @@ static int mdbox_save_finish_write(struct mail_save_context *_ctx)
 
 	if (ctx->ctx.failed) {
 		mail_index_expunge(ctx->ctx.trans, ctx->ctx.seq);
+		mail_cache_transaction_reset(ctx->ctx.ctx.transaction->cache_trans);
 		mdbox_map_append_abort(ctx->append_ctx);
 		array_delete(&ctx->mails, array_count(&ctx->mails) - 1, 1);
 		return -1;

diff --git a/src/lib-storage/index/dbox-single/sdbox-save.c b/src/lib-storage/index/dbox-single/sdbox-save.c
@@ -195,6 +195,7 @@ static int dbox_save_finish_write(struct mail_save_context *_ctx)
 
 	if (ctx->ctx.failed) {
 		mail_index_expunge(ctx->ctx.trans, ctx->ctx.seq);
+		mail_cache_transaction_reset(ctx->ctx.ctx.transaction->cache_trans);
 		dbox_file_append_rollback(&ctx->append_ctx);
 		dbox_file_unlink(*files);
 		dbox_file_unref(files);