[svn-commits] trunk r33814 - in /trunk: ./ pbx.c

[svn-commits at lists.digium.com]

Author: russell
Date: Tue Jun 13 07:41:37 2006
New Revision: 33814

URL: http://svn.digium.com/view/asterisk?rev=33814&view=rev
Log:
Merged revisions 33813 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r33813 | russell | 2006-06-13 08:40:40 -0400 (Tue, 13 Jun 2006) | 2 lines

remove duplicate mutex_unlock

........

Modified:
    trunk/   (props changed)
    trunk/pbx.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.2-merged' - no diff available.

Modified: trunk/pbx.c
URL: http://svn.digium.com/view/asterisk/trunk/pbx.c?rev=33814&r1=33813&r2=33814&view=diff
==============================================================================
--- trunk/pbx.c (original)
+++ trunk/pbx.c Tue Jun 13 07:41:37 2006
@@ -3426,7 +3426,6 @@
 
 	for (tmp = *local_contexts; tmp; tmp = tmp->next) {
 		if (!strcasecmp(tmp->name, name)) {
-			ast_mutex_unlock(&conlock);
 			ast_log(LOG_WARNING, "Tried to register context '%s', already in use\n", name);
 			if (!extcontexts)
 				ast_mutex_unlock(&conlock);