Revision
15322
Author
mikej
Date
2009-11-02 16:36:01 -0600 (Mon, 02 Nov 2009)

Log Message

add non opaque return for switch_thread_cond_timedwait

Modified Paths

Diff

Modified: freeswitch/trunk/src/switch_apr.c (15321 => 15322)


--- freeswitch/trunk/src/switch_apr.c	2009-11-02 19:17:38 UTC (rev 15321)
+++ freeswitch/trunk/src/switch_apr.c	2009-11-02 22:36:01 UTC (rev 15322)
@@ -365,7 +365,13 @@
 
 SWITCH_DECLARE(switch_status_t) switch_thread_cond_timedwait(switch_thread_cond_t *cond, switch_mutex_t *mutex, switch_interval_time_t timeout)
 {
-	return apr_thread_cond_timedwait(cond, mutex, timeout);
+	apr_status_t st = apr_thread_cond_timedwait(cond, mutex, timeout);
+
+	if (st == APR_TIMEUP) {
+		st = SWITCH_STATUS_TIMEOUT;
+	}
+
+	return st;
 }
 
 SWITCH_DECLARE(switch_status_t) switch_thread_cond_signal(switch_thread_cond_t *cond)