Merge remote-tracking branch 'origin/mdb.master'

[openldap] / servers / slapd / ctxcsn.c

diff --git a/servers/slapd/ctxcsn.c b/servers/slapd/ctxcsn.c
index c67bc886eecbbeb393dfa5206d79ecf78325929e..1331f338c4324b46b189cadcdecc658b6193a7c4 100644 (file)
--- a/servers/slapd/ctxcsn.c
+++ b/servers/slapd/ctxcsn.c
@@ -50,12 +50,12 @@ slap_get_commit_csn(
                *foundit = 0;
        }
 
-       ldap_pvt_thread_mutex_lock( &be->be_pcl_mutex );
-
        if ( !BER_BVISEMPTY( &op->o_csn )) {
                sid = slap_parse_csn_sid( &op->o_csn );
        }
 
+       ldap_pvt_thread_mutex_lock( &be->be_pcl_mutex );
+
        LDAP_TAILQ_FOREACH( csne, be->be_pending_csn_list, ce_csn_link ) {
                if ( csne->ce_opid == op->o_opid && csne->ce_connid == op->o_connid ) {
                        csne->ce_state = SLAP_CSN_COMMIT;
@@ -188,14 +188,14 @@ slap_queue_csn(
 
        Debug( LDAP_DEBUG_SYNC, "slap_queue_csn: queing %p %s\n", csn->bv_val, csn->bv_val, 0 );
 
-       ldap_pvt_thread_mutex_lock( &be->be_pcl_mutex );
-
        ber_dupbv( &pending->ce_csn, csn );
        ber_bvreplace_x( &op->o_csn, &pending->ce_csn, op->o_tmpmemctx );
        pending->ce_sid = slap_parse_csn_sid( csn );
        pending->ce_connid = op->o_connid;
        pending->ce_opid = op->o_opid;
        pending->ce_state = SLAP_CSN_PENDING;
+
+       ldap_pvt_thread_mutex_lock( &be->be_pcl_mutex );
        LDAP_TAILQ_INSERT_TAIL( be->be_pending_csn_list,
                pending, ce_csn_link );
        ldap_pvt_thread_mutex_unlock( &be->be_pcl_mutex );