[asterisk-commits] mjordan: trunk r349634 - in /trunk: ./ apps/confbridge/conf_config_parser.c

[SVN commits to the Asterisk project]

Author: mjordan
Date: Wed Jan  4 16:23:28 2012
New Revision: 349634

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=349634
Log:
Fix for ConfBridge config parser unlocking channel mutex too many times

When looking up a ConfBridge profile, the config parser would, if it
found a channel datastore on the channel requesting the bridge profile,
unlock the channel mutex twice.  Since that's a little aggressive,
it now only unlocks it once.

(closes issue ASTERISK-19042)
Reported by: Matt Jordan
Tested by: Matt Jordan
Patches: 
  19042 uploaded by David Vossel (license 5628)
........

Merged revisions 349619 from http://svn.asterisk.org/svn/asterisk/branches/10

Modified:
    trunk/   (props changed)
    trunk/apps/confbridge/conf_config_parser.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-10-merged' - no diff available.

Modified: trunk/apps/confbridge/conf_config_parser.c
URL: http://svnview.digium.com/svn/asterisk/trunk/apps/confbridge/conf_config_parser.c?view=diff&rev=349634&r1=349633&r2=349634
==============================================================================
--- trunk/apps/confbridge/conf_config_parser.c (original)
+++ trunk/apps/confbridge/conf_config_parser.c Wed Jan  4 16:23:28 2012
@@ -1332,8 +1332,9 @@
 				conf_user_profile_copy(result, &b_data->u_profile);
 				return result;
 			}
-		}
-		ast_channel_unlock(chan);
+		} else {
+			ast_channel_unlock(chan);
+		}
 	}
 
 	if (ast_strlen_zero(user_profile_name)) {