dovecot-2.2: dsync: Fixed assert-crash caused by previous change

dovecot at dovecot.org dovecot at dovecot.org
Tue Apr 9 14:18:03 EEST 2013


details:   http://hg.dovecot.org/dovecot-2.2/rev/194df093a05f
changeset: 16256:194df093a05f
user:      Timo Sirainen <tss at iki.fi>
date:      Tue Apr 09 14:17:56 2013 +0300
description:
dsync: Fixed assert-crash caused by previous change

diffstat:

 src/doveadm/dsync/dsync-mailbox-import.c |  10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diffs (27 lines):

diff -r 548e59794f2e -r 194df093a05f src/doveadm/dsync/dsync-mailbox-import.c
--- a/src/doveadm/dsync/dsync-mailbox-import.c	Mon Apr 08 18:14:32 2013 +0300
+++ b/src/doveadm/dsync/dsync-mailbox-import.c	Tue Apr 09 14:17:56 2013 +0300
@@ -1756,11 +1756,6 @@
 	while (importer->cur_mail != NULL)
 		(void)dsync_mailbox_try_save(importer, NULL);
 
-	dsync_mailbox_import_assign_new_uids(importer);
-	/* save mails from local sources where possible,
-	   request the rest from remote */
-	dsync_mailbox_import_handle_local_mails(importer);
-
 	if (importer->search_ctx != NULL) {
 		if (mailbox_search_deinit(&importer->search_ctx) < 0) {
 			i_error("Mailbox %s: Search failed: %s",
@@ -1769,6 +1764,11 @@
 			importer->failed = TRUE;
 		}
 	}
+
+	dsync_mailbox_import_assign_new_uids(importer);
+	/* save mails from local sources where possible,
+	   request the rest from remote */
+	dsync_mailbox_import_handle_local_mails(importer);
 }
 
 const struct dsync_mail_request *


More information about the dovecot-cvs mailing list