[asterisk-commits] pabelanger: branch 1.6.2 r296671 - in /branches/1.6.2: ./ channels/chan_iax2.c

[SVN commits to the Asterisk project]

Author: pabelanger
Date: Mon Nov 29 16:54:14 2010
New Revision: 296671

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=296671
Log:
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:
    branches/1.6.2/   (props changed)
    branches/1.6.2/channels/chan_iax2.c

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

Modified: branches/1.6.2/channels/chan_iax2.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.2/channels/chan_iax2.c?view=diff&rev=296671&r1=296670&r2=296671
==============================================================================
--- branches/1.6.2/channels/chan_iax2.c (original)
+++ branches/1.6.2/channels/chan_iax2.c Mon Nov 29 16:54:14 2010
@@ -13697,13 +13697,11 @@
 			iax2_destroy(x);
 		}
 	}
-	
+
 	/* Call for all threads to halt */
 	cleanup_thread_list(&idle_list);
 	cleanup_thread_list(&active_list);
 	cleanup_thread_list(&dynamic_list);
-
-	sched = ast_sched_thread_destroy(sched);
 
 	ast_netsock_release(netsock);
 	ast_netsock_release(outsock);
@@ -13728,6 +13726,7 @@
 	if (timer) {
 		ast_timer_close(timer);
 	}
+	sched = ast_sched_thread_destroy(sched);
 
 	con = ast_context_find(regcontext);
 	if (con)