X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=libraries%2Flibldap_r%2Ftpool.c;h=e23f9ad09cf8b252c31e89308af11490431b2a41;hb=78a9d66e53923e399978e8af066e3f085ca39b53;hp=4e832677941ea605951a5a6720ee68e51dd092b8;hpb=acbb5cf689a4336af05c9f259d909d8141055bac;p=openldap

diff --git a/libraries/libldap_r/tpool.c b/libraries/libldap_r/tpool.c
index 4e83267794..e23f9ad09c 100644
--- a/libraries/libldap_r/tpool.c
+++ b/libraries/libldap_r/tpool.c
@@ -595,6 +595,9 @@ ldap_int_thread_pool_wrapper (
 			 * should be like this:
 			 *   if (pool->ltp_open_count > 1 && pool->ltp_starting == 0)
 			 *       check timer, leave thread (break;)
+			 *
+			 * Just use pthread_cond_timedwait if we want to
+			 * check idle time.
 			 */
 
 			if (pool->ltp_state == LDAP_INT_THREAD_POOL_RUNNING
@@ -629,15 +632,6 @@ ldap_int_thread_pool_wrapper (
 			}
 			ldap_pvt_thread_cond_wait(&pool->ltp_cond, &pool->ltp_mutex);
 		}
-		ldap_pvt_thread_mutex_unlock(&pool->ltp_mutex);
-
-		ldap_pvt_thread_yield();
-
-		/* if we use an idle timer, here's
-		 * a good place to update it
-		 */
-
-		ldap_pvt_thread_mutex_lock(&pool->ltp_mutex);
 	}
 
 	for ( i=0; i<MAXKEYS && ltc_key[i].ltk_key; i++ ) {