[svn-commits] dhubbard: trunk r61784 - in /trunk: ./ channels/chan_zap.c

[svn-commits at lists.digium.com]

Author: dhubbard
Date: Tue Apr 24 14:08:28 2007
New Revision: 61784

URL: http://svn.digium.com/view/asterisk?view=rev&rev=61784
Log:
removed #if 0 block from chan_zap restart_monitor()

Modified:
    trunk/   (props changed)
    trunk/channels/chan_zap.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/channels/chan_zap.c
URL: http://svn.digium.com/view/asterisk/trunk/channels/chan_zap.c?view=diff&rev=61784&r1=61783&r2=61784
==============================================================================
--- trunk/channels/chan_zap.c (original)
+++ trunk/channels/chan_zap.c Tue Apr 24 14:08:28 2007
@@ -7308,14 +7308,8 @@
 		return -1;
 	}
 	if (monitor_thread != AST_PTHREADT_NULL) {
-		/* Just signal it to be sure it wakes up */
-#if 0
-		pthread_cancel(monitor_thread);
-#endif
+		/* Wake up the thread */
 		pthread_kill(monitor_thread, SIGURG);
-#if 0
-		pthread_join(monitor_thread, NULL);
-#endif
 	} else {
 		/* Start a new monitor */
 		if (ast_pthread_create_background(&monitor_thread, &attr, do_monitor, NULL) < 0) {