Revision

15213

Author

anthm

Date

2009-10-23 11:33:55 -0500 (Fri, 23 Oct 2009)

Log Message

FSCORE-472

Modified Paths

• freeswitch/trunk/src/switch_core_timer.c
• freeswitch/trunk/src/switch_time.c

Diff

--- freeswitch/trunk/src/switch_core_timer.c	2009-10-23 16:17:05 UTC (rev 15212)
+++ freeswitch/trunk/src/switch_core_timer.c	2009-10-23 16:33:55 UTC (rev 15213)
@@ -61,9 +61,7 @@
 		switch_set_flag(timer, SWITCH_TIMER_FLAG_FREE_POOL);
 	}
 
-	timer->timer_interface->timer_init(timer);
-	return SWITCH_STATUS_SUCCESS;
-
+	return timer->timer_interface->timer_init(timer);
 }
 
 SWITCH_DECLARE(switch_status_t) switch_core_timer_next(switch_timer_t *timer)

--- freeswitch/trunk/src/switch_time.c	2009-10-23 16:17:05 UTC (rev 15212)
+++ freeswitch/trunk/src/switch_time.c	2009-10-23 16:33:55 UTC (rev 15213)
@@ -233,8 +233,8 @@
 
 	while (globals.STARTED == 0) {
 		do_sleep(100000);
-		if (++sanity == 10) {
-			break;
+		if (++sanity == 300) {
+			abort();
 		}
 	}