From c87eec98003e764a9f561e495c5dc15e71262b04 Mon Sep 17 00:00:00 2001 From: Aaron Bannert Date: Sun, 28 Apr 2002 03:20:06 +0000 Subject: [PATCH] Preserve the original error, or if the unlock fails then use that error instead. Obtained from: Justin Erenkrantz Submitted by: Aaron Bannert git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94827 13f79535-47bb-0310-9956-ffa450edef68 --- server/mpm/worker/fdqueue.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/server/mpm/worker/fdqueue.c b/server/mpm/worker/fdqueue.c index e5d20747fb..7d9263ff01 100644 --- a/server/mpm/worker/fdqueue.c +++ b/server/mpm/worker/fdqueue.c @@ -130,9 +130,10 @@ apr_status_t ap_queue_info_wait_for_idler(fd_queue_info_t *queue_info) rv = apr_thread_cond_wait(queue_info->wait_for_idler, queue_info->idlers_mutex); if (rv != APR_SUCCESS) { - rv = apr_thread_mutex_unlock(queue_info->idlers_mutex); - if (rv != APR_SUCCESS) { - return rv; + apr_status_t rv2; + rv2 = apr_thread_mutex_unlock(queue_info->idlers_mutex); + if (rv2 != APR_SUCCESS) { + return rv2; } return rv; } -- 2.40.0