[asterisk-commits] mmichelson: branch 1.6.0 r194358 - in /branches/1.6.0: ./ main/channel.c

[SVN commits to the Asterisk project]

Author: mmichelson
Date: Wed May 13 14:50:04 2009
New Revision: 194358

URL: http://svn.asterisk.org/svn-view/asterisk?view=rev&rev=194358
Log:
Recorded merge of revisions 194357 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

................
  r194357 | mmichelson | 2009-05-13 14:42:51 -0500 (Wed, 13 May 2009) | 18 lines
  
  Blocked revisions 194356 via svnmerge
  
  ........
    r194356 | mmichelson | 2009-05-13 14:41:44 -0500 (Wed, 13 May 2009) | 13 lines
    
    Remove an extraneous unlocking operation from ast_channel_free.
    
    In the case that we could not remove the desired channel from the
    list of channels, there was an extra call to unlock the channel list.
    Since we unlock the list later on in the function anyway, this results
    in the list being unlocked twice yet only being locked once.
    
    (closes issue #15098)
    Reported by: tim_ringenbach
    Patches:
          remove_extra_unlock.diff uploaded by tim (license 540)
  ........
................

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.asterisk.org/svn-view/asterisk/branches/1.6.0/main/channel.c?view=diff&rev=194358&r1=194357&r2=194358
==============================================================================
--- branches/1.6.0/main/channel.c (original)
+++ branches/1.6.0/main/channel.c Wed May 13 14:50:04 2009
@@ -1313,7 +1313,6 @@
 	
 	AST_RWLIST_WRLOCK(&channels);
 	if (!AST_RWLIST_REMOVE(&channels, chan, chan_list)) {
-		AST_RWLIST_UNLOCK(&channels);
 		ast_log(LOG_ERROR, "Unable to find channel in list to free. Assuming it has already been done.\n");
 	}
 	/* Lock and unlock the channel just to be sure nobody has it locked still