From: Hallvard Furuseth <hallvard@openldap.org>
Date: Fri, 13 Jan 2012 15:07:39 +0000 (+0100)
Subject: ITS#7125 Fix Connection.c_mutex usage.
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=221d3ccdc66a30f1b8ce024147ff9cfaf5c69c2a;p=openldap

ITS#7125 Fix Connection.c_mutex usage.

Partial revert of 9e00b6cc6ce2857490b33218bdaf1339319c5f60:connection.c.
---

diff --git a/servers/slapd/connection.c b/servers/slapd/connection.c
index 5111e7d63b..a070500ecb 100644
--- a/servers/slapd/connection.c
+++ b/servers/slapd/connection.c
@@ -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 )