From: Yann Ylavic <ylavic@apache.org>
Date: Fri, 19 Jan 2018 14:04:53 +0000 (+0000)
Subject: mpm_fdqueue: follow up to r1821624.
X-Git-Tag: 2.5.0-alpha2-ci-test-only~2932
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8d5f6ca44f096897c0956d0285925922f0ba5a46;p=thirdparty%2Fapache%2Fhttpd.git

mpm_fdqueue: follow up to r1821624.

Either error matters, simplify code.



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1821659 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/server/mpm_fdqueue.c b/server/mpm_fdqueue.c
index 47496398eaf..81186455515 100644
--- a/server/mpm_fdqueue.c
+++ b/server/mpm_fdqueue.c
@@ -188,12 +188,8 @@ 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) {
-                apr_status_t rv2;
                 AP_DEBUG_ASSERT(0);
-                rv2 = apr_thread_mutex_unlock(queue_info->idlers_mutex);
-                if (rv2 != APR_SUCCESS) {
-                    return rv2;
-                }
+                apr_thread_mutex_unlock(queue_info->idlers_mutex);
                 return rv;
             }
         }