kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-06 09:59:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged revisions 131358 via svnmerge from

Browse Source 
https://origsvn.digium.com/svn/asterisk/trunk

................
r131358 | mmichelson | 2008-07-16 14:37:42 -0500 (Wed, 16 Jul 2008) | 14 lines

Merged revisions 131357 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r131357 | mmichelson | 2008-07-16 14:37:08 -0500 (Wed, 16 Jul 2008) | 6 lines

Apparently, "thread safety" is important, whatever
that means. :P

(Thanks Russell!)


........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@131359 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Mark Michelson
2008-07-16 19:39:05 +00:00
parent 58a8d7c521
commit fb892b269d
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
apps/app_queue.c
View File

@@ -3747,7 +3747,7 @@ static int try_calling(struct queue_ent *qe, const char *options, char *announce
* when the masquerade occurred. These other "ending" queue_log messages are unnecessary
*/
if (!attended_transfer_occurred(qe->chan)) {
struct ast_datastore *transfer_ds = ast_channel_datastore_find(qe->chan, &queue_transfer_info, NULL);
struct ast_datastore *transfer_ds;
if (strcasecmp(oldcontext, qe->chan->context) || strcasecmp(oldexten, qe->chan->exten)) {
ast_queue_log(queuename, qe->chan->uniqueid, member->membername, "TRANSFER", "%s|%s|%ld|%ld",
qe->chan->exten, qe->chan->context, (long) (callstart - qe->start),
@@ -3762,12 +3762,13 @@ static int try_calling(struct queue_ent *qe, const char *options, char *announce
(long) (callstart - qe->start), (long) (time(NULL) - callstart), qe->opos);
send_agent_complete(qe, queuename, peer, member, callstart, vars, sizeof(vars), AGENT);
}
ast_channel_lock(qe->chan);
transfer_ds = ast_channel_datastore_find(qe->chan, &queue_transfer_info, NULL);
if (transfer_ds) {
ast_channel_lock(qe->chan);
ast_channel_datastore_remove(qe->chan, transfer_ds);
ast_channel_datastore_free(transfer_ds);
ast_channel_unlock(qe->chan);
}
ast_channel_unlock(qe->chan);
}
if (bridge != AST_PBX_NO_HANGUP_PEER)