]> git.sur5r.net Git - openldap/commitdiff
ITS#7125 Fix Connection.c_mutex usage.
authorHallvard Furuseth <hallvard@openldap.org>
Fri, 13 Jan 2012 15:07:39 +0000 (16:07 +0100)
committerQuanah Gibson-Mount <quanah@openldap.org>
Fri, 20 Jan 2012 23:45:18 +0000 (15:45 -0800)
Partial revert of 9e00b6cc6ce2857490b33218bdaf1339319c5f60:connection.c.

servers/slapd/connection.c

index 5111e7d63b30f9290c434ad474366242169fbd3b..a070500ecbe86ace99eddc7cca2ad539bf591667 100644 (file)
@@ -225,7 +225,6 @@ int connections_timeout_idle(time_t now)
                 */
                if(( c->c_n_ops_executing && !c->c_writewaiter)
                        || c->c_conn_state == SLAP_C_CLIENT ) {
-                       connection_done( c );
                        continue;
                }
 
@@ -247,8 +246,8 @@ int connections_timeout_idle(time_t now)
                                continue;
                        }
                }
-               connection_done( c );
        }
+       connection_done( c );
        if ( old && !writers )
                slapd_clr_writetime( old );
 
@@ -270,12 +269,12 @@ void connections_drop()
                 */
                if(( c->c_n_ops_executing && !c->c_writewaiter)
                        || c->c_conn_state == SLAP_C_CLIENT ) {
-                       connection_done( c );
                        continue;
                }
                connection_closing( c, "dropping" );
                connection_close( c );
        }
+       connection_done( c );
 }
 
 static Connection* connection_get( ber_socket_t s )