[svn-commits] mmichelson: branch 1.6.0 r131359 - in /branches/1.6.0: ./ apps/app_queue.c

[SVN commits to the Digium repositories]

Author: mmichelson
Date: Wed Jul 16 14:39:05 2008
New Revision: 131359

URL: http://svn.digium.com/view/asterisk?view=rev&rev=131359
Log:
Merged revisions 131358 via svnmerge from 
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!)


........

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

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/apps/app_queue.c

Propchange: branches/1.6.0/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.0/apps/app_queue.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/apps/app_queue.c?view=diff&rev=131359&r1=131358&r2=131359
==============================================================================
--- branches/1.6.0/apps/app_queue.c (original)
+++ branches/1.6.0/apps/app_queue.c Wed Jul 16 14:39:05 2008
@@ -3747,7 +3747,7 @@
 		 * 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 @@
 					(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)