[asterisk-commits] mmichelson: trunk r410608 - in /trunk: ./ main/db.c
SVN commits to the Asterisk project
asterisk-commits at lists.digium.com
Fri Mar 14 15:55:09 CDT 2014
Author: mmichelson
Date: Fri Mar 14 15:55:06 2014
New Revision: 410608
URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=410608
Log:
Remove an extra ast_cond_wait() that slipped through the patch.
........
Merged revisions 410606 from http://svn.asterisk.org/svn/asterisk/branches/11
........
Merged revisions 410607 from http://svn.asterisk.org/svn/asterisk/branches/12
Modified:
trunk/ (props changed)
trunk/main/db.c
Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-12-merged' - no diff available.
Modified: trunk/main/db.c
URL: http://svnview.digium.com/svn/asterisk/trunk/main/db.c?view=diff&rev=410608&r1=410607&r2=410608
==============================================================================
--- trunk/main/db.c (original)
+++ trunk/main/db.c Fri Mar 14 15:55:06 2014
@@ -967,8 +967,6 @@
ast_cond_wait(&dbcond, &dblock);
}
dosync = 0;
- /* We're ok with spurious wakeups, so we don't worry about a predicate */
- ast_cond_wait(&dbcond, &dblock);
if (ast_db_commit_transaction()) {
ast_db_rollback_transaction();
}
More information about the asterisk-commits
mailing list