diff options
author | Yann Ylavic <ylavic@apache.org> | 2015-03-19 21:36:21 +0000 |
---|---|---|
committer | Yann Ylavic <ylavic@apache.org> | 2015-03-19 21:36:21 +0000 |
commit | 9439395d75690793d77ad6cb6b39db8c4a497c23 (patch) | |
tree | 19aa8e188ef5e1c6d48e59361dcdfe0b08b1a37d /locks | |
parent | fd41de7920ad7ccde09fcc33830cc8f0f79533f9 (diff) | |
download | apr-9439395d75690793d77ad6cb6b39db8c4a497c23.tar.gz |
Merge r767895 from trunk.
apr_thread_cond_*wait() on BeOS: Fix broken logic.
PR: 45800
Submitted by: Jochen Voss (no e-mail)
Reviewed by: trawick
Backported by: ylavic
git-svn-id: https://svn.apache.org/repos/asf/apr/apr/branches/1.6.x@1667883 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'locks')
-rw-r--r-- | locks/beos/thread_cond.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/locks/beos/thread_cond.c b/locks/beos/thread_cond.c index e3ea46000..44189d908 100644 --- a/locks/beos/thread_cond.c +++ b/locks/beos/thread_cond.c @@ -113,10 +113,11 @@ static apr_status_t do_wait(apr_thread_cond_t *cond, apr_thread_mutex_t *mutex, apr_thread_mutex_lock(cond->condlock); - if (rv != B_OK) + if (rv != B_OK) { if (rv == B_TIMED_OUT) return APR_TIMEUP; return rv; + } acquire_sem(cond->lock); APR_RING_REMOVE(wait, link); |