[asterisk-commits] mmichelson: branch 1.4 r194356 - /branches/1.4/main/channel.c

[SVN commits to the Asterisk project]

Author: mmichelson
Date: Wed May 13 14:41:44 2009
New Revision: 194356

URL: http://svn.asterisk.org/svn-view/asterisk?view=rev&rev=194356
Log:
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.4/main/channel.c

Modified: branches/1.4/main/channel.c
URL: http://svn.asterisk.org/svn-view/asterisk/branches/1.4/main/channel.c?view=diff&rev=194356&r1=194355&r2=194356
==============================================================================
--- branches/1.4/main/channel.c (original)
+++ branches/1.4/main/channel.c Wed May 13 14:41:44 2009
@@ -1225,7 +1225,6 @@
 	
 	AST_LIST_LOCK(&channels);
 	if (!AST_LIST_REMOVE(&channels, chan, chan_list)) {
-		AST_LIST_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