[prev in list] [next in list] [prev in thread] [next in thread]
List: asterisk-commits
Subject: [asterisk-commits] pabelanger: branch 1.8 r296673 - in
From: SVN commits to the Asterisk project <asterisk-commits () lists ! digium ! com>
Date: 2010-11-29 23:05:50
Message-ID: E1PNCn8-0002Gf-Dq () wibble ! digium ! internal
[Download RAW message or body]
Author: pabelanger
Date: Mon Nov 29 17:05:45 2010
New Revision: 296673
URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=296673
Log:
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:
branches/1.8/ (props changed)
branches/1.8/channels/chan_iax2.c
Propchange: branches/1.8/
------------------------------------------------------------------------------
Binary property 'branch-1.6.2-merged' - no diff available.
Modified: branches/1.8/channels/chan_iax2.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.8/channels/chan_iax2.c?view=diff&rev=296673&r1=296672&r2=296673
==============================================================================
--- branches/1.8/channels/chan_iax2.c (original)
+++ branches/1.8/channels/chan_iax2.c Mon Nov 29 17:05:45 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)
--
_____________________________________________________________________
-- Bandwidth and Colocation Provided by http://www.api-digital.com --
asterisk-commits mailing list
To UNSUBSCRIBE or update options visit:
http://lists.digium.com/mailman/listinfo/asterisk-commits
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic