summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormturk <mturk@13f79535-47bb-0310-9956-ffa450edef68>2008-08-07 05:46:07 +0000
committermturk <mturk@13f79535-47bb-0310-9956-ffa450edef68>2008-08-07 05:46:07 +0000
commit49cba930957520bffcfc9fa8356afc96c6ee876c (patch)
treeb16b91933afdab044e8d5ac43be9612edd5a511f
parent9e57bf08b109214f3f0d1f3b4e3926e31d93da42 (diff)
downloadlibapr-util-49cba930957520bffcfc9fa8356afc96c6ee876c.tar.gz
Revert r683191. Any blocking code should be done before invalidate to deal with serialization.
git-svn-id: http://svn.apache.org/repos/asf/apr/apr-util/trunk@683515 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r--misc/apr_reslist.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/misc/apr_reslist.c b/misc/apr_reslist.c
index dac2c99e..19871203 100644
--- a/misc/apr_reslist.c
+++ b/misc/apr_reslist.c
@@ -452,11 +452,10 @@ APU_DECLARE(apr_status_t) apr_reslist_invalidate(apr_reslist_t *reslist,
void *resource)
{
apr_status_t ret;
-
- ret = reslist->destructor(resource, reslist->params, reslist->pool);
#if APR_HAS_THREADS
apr_thread_mutex_lock(reslist->listlock);
#endif
+ ret = reslist->destructor(resource, reslist->params, reslist->pool);
reslist->ntotal--;
#if APR_HAS_THREADS
apr_thread_cond_signal(reslist->avail);