automerge commit

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@33840 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/pbx.c b/pbx.c
index 4f71fc5c15d1b990a6bd49bd8e662ec619d38df6..c45ec8e3b9299162f840941e7ebed0da30162059 100644 (file)
--- a/pbx.c
+++ b/pbx.c
@@ -3652,7 +3652,6 @@ struct ast_context *ast_context_create(struct ast_context **extcontexts, const c
        tmp = *local_contexts;
        while(tmp) {
                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);