Merged revisions 77771 via svnmerge from
authorJoshua Colp <jcolp@digium.com>
Mon, 30 Jul 2007 15:49:30 +0000 (15:49 +0000)
committerJoshua Colp <jcolp@digium.com>
Mon, 30 Jul 2007 15:49:30 +0000 (15:49 +0000)
commit3733874f49af1a9ed705052ea3f698d8e717c426
tree9deabf8ad4adb677e902502711cb6b4085d71ff4
parent9d959a040ee87ffe2dca9e4556340d4df272b5c5
Merged revisions 77771 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r77771 | file | 2007-07-30 12:47:52 -0300 (Mon, 30 Jul 2007) | 6 lines

(closes issue #10301)
Reported by: fnordian
Patches:
      asterisk-1.4.9-channel.c.patch uploaded by fnordian (license 110)
Restore previous behavior where if we failed to lock the channel we wanted we would return to exactly the same point as if we had just reentered the function.

........

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