[asterisk-commits] tilghman: branch 1.6.1 r154267 - in /branches/1.6.1: ./ channels/chan_h323.c

[SVN commits to the Asterisk project]

Author: tilghman
Date: Tue Nov  4 13:02:21 2008
New Revision: 154267

URL: http://svn.digium.com/view/asterisk?view=rev&rev=154267
Log:
Merged revisions 154264 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

................
  r154264 | tilghman | 2008-11-04 12:59:48 -0600 (Tue, 04 Nov 2008) | 10 lines
  
  Recorded merge of revisions 154263 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r154263 | tilghman | 2008-11-04 12:58:05 -0600 (Tue, 04 Nov 2008) | 3 lines
    
    Make the monitor thread non-detached, so it can be joined (suggested by Russell
    on -dev list).
  ........
................

Modified:
    branches/1.6.1/   (props changed)
    branches/1.6.1/channels/chan_h323.c

Propchange: branches/1.6.1/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.1/channels/chan_h323.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.1/channels/chan_h323.c?view=diff&rev=154267&r1=154266&r2=154267
==============================================================================
--- branches/1.6.1/channels/chan_h323.c (original)
+++ branches/1.6.1/channels/chan_h323.c Tue Nov  4 13:02:21 2008
@@ -2604,7 +2604,7 @@
 		pthread_kill(monitor_thread, SIGURG);
 	} else {
 		/* Start a new monitor */
-		if (ast_pthread_create_detached_background(&monitor_thread, NULL, do_monitor, NULL) < 0) {
+		if (ast_pthread_create_background(&monitor_thread, NULL, do_monitor, NULL) < 0) {
 			monitor_thread = AST_PTHREADT_NULL;
 			ast_mutex_unlock(&monlock);
 			ast_log(LOG_ERROR, "Unable to start monitor thread.\n");
@@ -3302,8 +3302,7 @@
 				pthread_cancel(monitor_thread);
 			}
 			pthread_kill(monitor_thread, SIGURG);
-			/* Cannot join detached threads */
-			/* pthread_join(monitor_thread, NULL); */
+			pthread_join(monitor_thread, NULL);
 		}
 		monitor_thread = AST_PTHREADT_STOP;
 		ast_mutex_unlock(&monlock);