[svn-commits] russell: branch 1.6.0 r108033 - in /branches/1.6.0: ./ main/channel.c

[SVN commits to the Digium repositories]

Author: russell
Date: Wed Mar 12 12:03:18 2008
New Revision: 108033

URL: http://svn.digium.com/view/asterisk?view=rev&rev=108033
Log:
Merged revisions 108032 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

................
r108032 | russell | 2008-03-12 12:02:57 -0500 (Wed, 12 Mar 2008) | 12 lines

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

........
r108031 | russell | 2008-03-12 11:59:07 -0500 (Wed, 12 Mar 2008) | 4 lines

Destroy the channel lock after the channel datastores.

(inspired by issue #12187)

........

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

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

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

Modified: branches/1.6.0/main/channel.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/main/channel.c?view=diff&rev=108033&r1=108032&r2=108033
==============================================================================
--- branches/1.6.0/main/channel.c (original)
+++ branches/1.6.0/main/channel.c Wed Mar 12 12:03:18 2008
@@ -1287,7 +1287,6 @@
 	if (chan->pbx)
 		ast_log(LOG_WARNING, "PBX may not have been terminated properly on '%s'\n", chan->name);
 	free_cid(&chan->cid);
-	ast_mutex_destroy(&chan->lock_dont_use);
 	/* Close pipes if appropriate */
 	if ((fd = chan->alertpipe[0]) > -1)
 		close(fd);
@@ -1321,6 +1320,8 @@
 
 	/* Destroy the jitterbuffer */
 	ast_jb_destroy(chan);
+	
+	ast_mutex_destroy(&chan->lock_dont_use);
 
 	ast_string_field_free_memory(chan);
 	ast_free(chan);