main/pbx.c: Fix double lock of contexts lock introduced by r429967
authorMatthew Jordan <mjordan@digium.com>
Wed, 24 Dec 2014 16:59:42 +0000 (16:59 +0000)
committerMatthew Jordan <mjordan@digium.com>
Wed, 24 Dec 2014 16:59:42 +0000 (16:59 +0000)
commit3a73c6c90e8a9e1e42cc530569273a59febab86d
treeed3160356d17797b08ff3d17309b6c53de15f77f
parent7ea4156a5e3540465fd028514cb52fde290f33d2
main/pbx.c: Fix double lock of contexts lock introduced by r429967

We only need to hold the context_merge_lock once. Locking it twice will make
many other parts of Asterisk very sad.

ASTERISK-24641 #close

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