Merged revisions 106437 via svnmerge from

https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r106437 | mmichelson | 2008-03-06 16:10:07 -0600 (Thu, 06 Mar 2008) | 8 lines

Quell an annoying message that is likely to print every single time that
ast_pbx_outgoing_app is called. The reason is that __ast_request_and_dial
allocates the cdr for the channel, so it should be expected that the channel
will have a cdr on it.

Thanks to joetester on IRC for pointing this out

........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@106438 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/main/pbx.c b/main/pbx.c
index 89d7d2f..8d9658f 100644 (file)
--- a/main/pbx.c
+++ b/main/pbx.c
@@ -6573,9 +6573,7 @@ int ast_pbx_outgoing_app(const char *type, int format, void *data, int timeout,
        if (sync) {
                chan = __ast_request_and_dial(type, format, data, timeout, reason, cid_num, cid_name, &oh);
                if (chan) {
        if (sync) {
                chan = __ast_request_and_dial(type, format, data, timeout, reason, cid_num, cid_name, &oh);
                if (chan) {

-                       if (chan->cdr) { /* check if the channel already has a cdr record, if not give it one */
-                               ast_log(LOG_WARNING, "%s already has a call record??\n", chan->name);
-                       } else {
+                       if (!chan->cdr) { /* check if the channel already has a cdr record, if not give it one */

                                chan->cdr = ast_cdr_alloc();   /* allocate a cdr for the channel */
                                if (!chan->cdr) {
                                        /* allocation of the cdr failed */
                                chan->cdr = ast_cdr_alloc();   /* allocate a cdr for the channel */
                                if (!chan->cdr) {
                                        /* allocation of the cdr failed */