[asterisk-commits] murf: trunk r70951 - in /trunk: ./ main/cdr.c

[SVN commits to the Asterisk project]

Author: murf
Date: Thu Jun 21 17:41:05 2007
New Revision: 70951

URL: http://svn.digium.com/view/asterisk?view=rev&rev=70951
Log:
Merged revisions 70949 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

................
r70949 | murf | 2007-06-21 16:34:41 -0600 (Thu, 21 Jun 2007) | 9 lines

Merged revisions 70948 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r70948 | murf | 2007-06-21 16:29:50 -0600 (Thu, 21 Jun 2007) | 1 line

This little fix is in response to bug 10016, but may not cure it. The code is wrong, clearly. In a situation where you set the CDR's amaflags, and then ForkCDR, and then set the new CDR's amaflags to some other value, you will see that all CDRs have had their amaflags changed. This is not good. So I fixed it.
........

................

Modified:
    trunk/   (props changed)
    trunk/main/cdr.c

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

Modified: trunk/main/cdr.c
URL: http://svn.digium.com/view/asterisk/trunk/main/cdr.c?view=diff&rev=70951&r1=70950&r2=70951
==============================================================================
--- trunk/main/cdr.c (original)
+++ trunk/main/cdr.c Thu Jun 21 17:41:05 2007
@@ -848,8 +848,11 @@
 	struct ast_cdr *cdr;
 	int newflag = ast_cdr_amaflags2int(flag);
 	if (newflag) {
-		for (cdr = chan->cdr; cdr; cdr = cdr->next)
-			cdr->amaflags = newflag;
+		for (cdr = chan->cdr; cdr; cdr = cdr->next) {
+			if (!ast_test_flag(cdr, AST_CDR_FLAG_LOCKED)) {
+				cdr->amaflags = newflag;
+			}
+		}
 	}
 
 	return 0;