[asterisk-commits] pabelanger: trunk r296674 - in /trunk: ./ channels/chan_iax2.c

[SVN commits to the Asterisk project]

Author: pabelanger
Date: Mon Nov 29 17:07:06 2010
New Revision: 296674

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=296674
Log:
Merged revisions 296673 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.8

................
  r296673 | pabelanger | 2010-11-29 18:05:45 -0500 (Mon, 29 Nov 2010) | 19 lines
  
  Merged revisions 296671 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.6.2
  
  ................
    r296671 | pabelanger | 2010-11-29 17:54:14 -0500 (Mon, 29 Nov 2010) | 12 lines
    
    Merged revisions 296670 via svnmerge from 
    https://origsvn.digium.com/svn/asterisk/branches/1.4
    
    ........
      r296670 | pabelanger | 2010-11-29 17:49:39 -0500 (Mon, 29 Nov 2010) | 5 lines
      
      Make sure nothing else is needed before destroying the scheduler.
      
      (closes issue #18398)
      Reported by: pabelanger
    ........
  ................
................

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

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

Modified: trunk/channels/chan_iax2.c
URL: http://svnview.digium.com/svn/asterisk/trunk/channels/chan_iax2.c?view=diff&rev=296674&r1=296673&r2=296674
==============================================================================
--- trunk/channels/chan_iax2.c (original)
+++ trunk/channels/chan_iax2.c Mon Nov 29 17:07:06 2010
@@ -14218,8 +14218,6 @@
 	cleanup_thread_list(&active_list);
 	cleanup_thread_list(&dynamic_list);
 
-	sched = ast_sched_thread_destroy(sched);
-
 	ast_netsock_release(netsock);
 	ast_netsock_release(outsock);
 	for (x = 0; x < ARRAY_LEN(iaxs); x++) {
@@ -14261,6 +14259,7 @@
 		ast_timer_close(timer);
 	}
 	transmit_processor = ast_taskprocessor_unreference(transmit_processor);
+	sched = ast_sched_thread_destroy(sched);
 
 	con = ast_context_find(regcontext);
 	if (con)