[svn-commits] russell: trunk r108894 - /trunk/main/pbx.c

[SVN commits to the Digium repositories]

Author: russell
Date: Sat Mar 15 11:21:04 2008
New Revision: 108894

URL: http://svn.digium.com/view/asterisk?view=rev&rev=108894
Log:
Remove a double write lock of the contexts lock in ast_wrlock_contexts().
How did this ever work?

(closes issue #12219)
Reported by: ys
Patches: 
      pbx.c.diff uploaded by ys (license 281)

Modified:
    trunk/main/pbx.c

Modified: trunk/main/pbx.c
URL: http://svn.digium.com/view/asterisk/trunk/main/pbx.c?view=diff&rev=108894&r1=108893&r2=108894
==============================================================================
--- trunk/main/pbx.c (original)
+++ trunk/main/pbx.c Sat Mar 15 11:21:04 2008
@@ -7823,7 +7823,7 @@
 	int res = ast_rwlock_wrlock(&conlock);
 	if (!res)
 		ast_atomic_fetchadd_int(&conlock_wrlock_version, 1);
-	return ast_rwlock_wrlock(&conlock);
+	return res;
 }
 
 int ast_rdlock_contexts()