Merged revisions 315053 via svnmerge from

https://origsvn.digium.com/svn/asterisk/branches/1.8

................
  r315053 | alecdavis | 2011-04-25 19:14:32 +1200 (Mon, 25 Apr 2011) | 23 lines
  
  Merged revisions 315052 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.6.2
  
  ................
    r315052 | alecdavis | 2011-04-25 19:11:12 +1200 (Mon, 25 Apr 2011) | 16 lines
    
    Merged revisions 315051 via svnmerge from 
    https://origsvn.digium.com/svn/asterisk/branches/1.4
    
    ........
      r315051 | alecdavis | 2011-04-25 19:06:29 +1200 (Mon, 25 Apr 2011) | 11 lines
      
      chan_local:check_bridge() misplaced misplaced ast_mutex_unlock 
      
      if !p->chan->_bridge->_softhangup path isn't followed, brigde remains locked.
      
      (closes issue #19176)
      Reported by: alecdavis
      Patches: 
            bug19176.diff.txt uploaded by alecdavis (license 585)
    ........
  ................
................


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

channels/chan_local.c

@@ -504,8 +504,8 @@ static void check_bridge(struct local_pvt *p)
 					}
 					ast_channel_unlock(p->owner);
 				}
-				ast_channel_unlock(p->chan->_bridge);
 			}
+			ast_channel_unlock(p->chan->_bridge);
 		}
 	}
 }