[asterisk-commits] dhubbard: branch 1.4 r61779 - in /branches/1.4: ./ channels/chan_zap.c

[asterisk-commits at lists.digium.com]

Author: dhubbard
Date: Tue Apr 24 13:43:53 2007
New Revision: 61779

URL: http://svn.digium.com/view/asterisk?view=rev&rev=61779
Log:
Merged revisions 61777 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r61777 | dhubbard | 2007-04-24 13:20:31 -0500 (Tue, 24 Apr 2007) | 1 line

removed #if 0 block from chan_phone, chan_zap, and chan_modem restart_monitor()
........

Modified:
    branches/1.4/   (props changed)
    branches/1.4/channels/chan_zap.c

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

Modified: branches/1.4/channels/chan_zap.c
URL: http://svn.digium.com/view/asterisk/branches/1.4/channels/chan_zap.c?view=diff&rev=61779&r1=61778&r2=61779
==============================================================================
--- branches/1.4/channels/chan_zap.c (original)
+++ branches/1.4/channels/chan_zap.c Tue Apr 24 13:43:53 2007
@@ -6932,14 +6932,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) {