[asterisk-commits] file: branch 1.4 r72257 - in /branches/1.4: ./ main/channel.c

[SVN commits to the Asterisk project]

Author: file
Date: Wed Jun 27 15:25:24 2007
New Revision: 72257

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

........
r72256 | file | 2007-06-27 16:23:24 -0400 (Wed, 27 Jun 2007) | 2 lines

I may possibly get shot for doing this... but... defer CDR processing until after the channel has been dealt with. This should eliminate all of the issues with channels going funky (SIP/PRI) when you are posting CDRs to a database that is either slow or unavailable and do not want to enable batching.

........

Modified:
    branches/1.4/   (props changed)
    branches/1.4/main/channel.c

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

Modified: branches/1.4/main/channel.c
URL: http://svn.digium.com/view/asterisk/branches/1.4/main/channel.c?view=diff&rev=72257&r1=72256&r2=72257
==============================================================================
--- branches/1.4/main/channel.c (original)
+++ branches/1.4/main/channel.c Wed Jun 27 15:25:24 2007
@@ -1697,6 +1697,7 @@
 int ast_hangup(struct ast_channel *chan)
 {
 	int res = 0;
+	struct ast_cdr *cdr = NULL;
 
 	/* Don't actually hang up a channel that will masquerade as someone else, or
 	   if someone is going to masquerade as us */
@@ -1743,7 +1744,7 @@
 	chan->generator = NULL;
 	if (chan->cdr) {		/* End the CDR if it hasn't already */
 		ast_cdr_end(chan->cdr);
-		ast_cdr_detach(chan->cdr);	/* Post and Free the CDR */
+		cdr = chan->cdr;
 		chan->cdr = NULL;
 	}
 	if (ast_test_flag(chan, AST_FLAG_BLOCKING)) {
@@ -1774,6 +1775,10 @@
 			ast_cause2str(chan->hangupcause)
 			);
 	ast_channel_free(chan);
+
+	if (cdr)
+		ast_cdr_detach(cdr);
+
 	return res;
 }