Commit faa13725 authored by Pierangelo Masarati's avatar Pierangelo Masarati
Browse files

remove unnecessary assertion; add test for pending ops

parent cb3248f1
...@@ -857,16 +857,15 @@ connection_close( Connection *c ) ...@@ -857,16 +857,15 @@ connection_close( Connection *c )
ber_sockbuf_ctrl( c->c_sb, LBER_SB_OPT_GET_FD, &sd ); ber_sockbuf_ctrl( c->c_sb, LBER_SB_OPT_GET_FD, &sd );
} }
if ( !LDAP_STAILQ_EMPTY(&c->c_ops) ) { if ( !LDAP_STAILQ_EMPTY(&c->c_ops) ||
!LDAP_STAILQ_EMPTY(&c->c_pending_ops) )
{
Debug( LDAP_DEBUG_TRACE, Debug( LDAP_DEBUG_TRACE,
"connection_close: deferring conn=%lu sd=%d\n", "connection_close: deferring conn=%lu sd=%d\n",
c->c_connid, sd, 0 ); c->c_connid, sd, 0 );
return; return;
} }
/* NOTE: if there's no pending ops, writewaiter must be 0 (ITS#4659) */
assert( c->c_writewaiter == 0 );
Debug( LDAP_DEBUG_TRACE, "connection_close: conn=%lu sd=%d\n", Debug( LDAP_DEBUG_TRACE, "connection_close: conn=%lu sd=%d\n",
c->c_connid, sd, 0 ); c->c_connid, sd, 0 );
...@@ -1158,6 +1157,7 @@ operations_error: ...@@ -1158,6 +1157,7 @@ operations_error:
op->o_cancel = LDAP_TOO_LATE; op->o_cancel = LDAP_TOO_LATE;
} }
} }
while ( op->o_cancel != SLAP_CANCEL_NONE && while ( op->o_cancel != SLAP_CANCEL_NONE &&
op->o_cancel != SLAP_CANCEL_DONE ) op->o_cancel != SLAP_CANCEL_DONE )
{ {
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment