]> git.ipfire.org Git - thirdparty/apache/httpd.git/commitdiff
mpm_fdqueue: follow up to r1821624.
authorYann Ylavic <ylavic@apache.org>
Fri, 19 Jan 2018 14:04:53 +0000 (14:04 +0000)
committerYann Ylavic <ylavic@apache.org>
Fri, 19 Jan 2018 14:04:53 +0000 (14:04 +0000)
Either error matters, simplify code.

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

server/mpm_fdqueue.c

index 47496398eafeef5142d61a0b6fa3d7aaedd01a0a..811864555159383978dd90d7b24ed3ccee2606f8 100644 (file)
@@ -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;
             }
         }