summaryrefslogtreecommitdiff
path: root/threadproc/unix
diff options
context:
space:
mode:
authortrawick <trawick@13f79535-47bb-0310-9956-ffa450edef68>2001-08-01 16:54:58 +0000
committertrawick <trawick@13f79535-47bb-0310-9956-ffa450edef68>2001-08-01 16:54:58 +0000
commit0a945641f4e903244f55076f704e09f63ae97bcf (patch)
tree2142eacfce2512844029a4b08edd39e6920536ee /threadproc/unix
parentae2117f14b2d136d8028d83bcb2ddaad3c015769 (diff)
downloadlibapr-0a945641f4e903244f55076f704e09f63ae97bcf.tar.gz
if the thread returns NULL instead of the address of an apr_status_t
then assume a status of APR_SUCCESS in apr_thread_join() git-svn-id: http://svn.apache.org/repos/asf/apr/apr/trunk@62070 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'threadproc/unix')
-rw-r--r--threadproc/unix/thread.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/threadproc/unix/thread.c b/threadproc/unix/thread.c
index d2a568428..daa8b2566 100644
--- a/threadproc/unix/thread.c
+++ b/threadproc/unix/thread.c
@@ -189,7 +189,7 @@ apr_status_t apr_thread_join(apr_status_t *retval, apr_thread_t *thd)
apr_status_t *thread_stat;
if ((stat = pthread_join(*thd->td,(void *)&thread_stat)) == 0) {
- *retval = *thread_stat;
+ *retval = thread_stat ? *thread_stat : APR_SUCCESS;
return APR_SUCCESS;
}
else {