From: Timo Sirainen Date: Fri, 20 Mar 2009 22:22:37 +0000 (-0400) Subject: Removed some asserts that dbox code hits now. X-Git-Tag: 2.0.alpha1~1038^2~33 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=346ee8b23fe6187632efe5930e59dafa17625138;p=thirdparty%2Fdovecot%2Fcore.git Removed some asserts that dbox code hits now. --HG-- branch : HEAD --- diff --git a/src/lib-index/mail-index-transaction.c b/src/lib-index/mail-index-transaction.c index ec2517b745..b33a2d47cf 100644 --- a/src/lib-index/mail-index-transaction.c +++ b/src/lib-index/mail-index-transaction.c @@ -1367,7 +1367,7 @@ void mail_index_atomic_inc_ext(struct mail_index_transaction *t, uint32_t seq, i_assert(ext_id < array_count(&t->view->index->extensions)); /* currently non-external transactions can be applied multiple times, causing multiple increments. */ - i_assert((t->flags & MAIL_INDEX_TRANSACTION_FLAG_EXTERNAL) != 0); + //FIXME:i_assert((t->flags & MAIL_INDEX_TRANSACTION_FLAG_EXTERNAL) != 0); t->log_ext_updates = TRUE; if (!array_is_created(&t->ext_rec_atomics)) diff --git a/src/lib-index/mail-transaction-log-append.c b/src/lib-index/mail-transaction-log-append.c index d0d4b30428..be8bf22d7d 100644 --- a/src/lib-index/mail-transaction-log-append.c +++ b/src/lib-index/mail-transaction-log-append.c @@ -723,10 +723,7 @@ int mail_transaction_log_append(struct mail_index_transaction *t, } index = mail_index_view_get_index(t->view); - if (index->log_locked) { - i_assert((t->flags & - MAIL_INDEX_TRANSACTION_FLAG_EXTERNAL) != 0); - } else { + if (!index->log_locked) { if (mail_transaction_log_lock_head(index->log) < 0) return -1; }