Remove unnecessary (but unexecutable) unlocks, cleanup code (bug #6220)

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@8017 65c4cc65-6c06-0410-ace0-fbb531ad65f3

1 files changed, 2 insertions, 3 deletions

diff --git a/pbx.c b/pbx.c
index 8c12d556e..a70f922fc 100644
--- a/pbx.c
+++ b/pbx.c
@@ -5058,7 +5058,7 @@ void __ast_context_destroy(struct ast_context *con, const char *registrar)
 			   is searching through it. */
 			if (ast_mutex_lock(&tmp->lock)) {
 				ast_log(LOG_WARNING, "Unable to lock context lock\n");
-				return;
+				break;
 			}
 			if (tmpl)
 				tmpl->next = tmp->next;
@@ -5105,8 +5105,7 @@ void __ast_context_destroy(struct ast_context *con, const char *registrar)
 				tmpil = NULL;
 				continue;
 			}
-			ast_mutex_unlock(&conlock);
-			return;
+			break;
 		}
 		tmpl = tmp;
 		tmp = tmp->next;