[asterisk-commits] alecdavis: branch 1.6.2 r315052 - in /branches/1.6.2: ./ channels/chan_local.c

[SVN commits to the Asterisk project]

Author: alecdavis
Date: Mon Apr 25 02:11:12 2011
New Revision: 315052

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=315052
Log:
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)
........

Modified:
    branches/1.6.2/   (props changed)
    branches/1.6.2/channels/chan_local.c

Propchange: branches/1.6.2/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: branches/1.6.2/channels/chan_local.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.2/channels/chan_local.c?view=diff&rev=315052&r1=315051&r2=315052
==============================================================================
--- branches/1.6.2/channels/chan_local.c (original)
+++ branches/1.6.2/channels/chan_local.c Mon Apr 25 02:11:12 2011
@@ -468,8 +468,8 @@
 					}
 					ast_channel_unlock(p->owner);
 				}
-				ast_channel_unlock(p->chan->_bridge);
 			}
+			ast_channel_unlock(p->chan->_bridge);
 		}
 	}
 }