[svn-commits] tilghman: trunk r89049 - in /trunk: ./ include/asterisk/lock.h

[SVN commits to the Digium repositories]

Author: tilghman
Date: Tue Nov  6 13:16:02 2007
New Revision: 89049

URL: http://svn.digium.com/view/asterisk?view=rev&rev=89049
Log:
Merged revisions 89045 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r89045 | tilghman | 2007-11-06 13:09:06 -0600 (Tue, 06 Nov 2007) | 2 lines

We went to the trouble of creating a method of tracking failed trylocks, then never turned it on (oops).

........

Modified:
    trunk/   (props changed)
    trunk/include/asterisk/lock.h

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

Modified: trunk/include/asterisk/lock.h
URL: http://svn.digium.com/view/asterisk/trunk/include/asterisk/lock.h?view=diff&rev=89049&r1=89048&r2=89049
==============================================================================
--- trunk/include/asterisk/lock.h (original)
+++ trunk/include/asterisk/lock.h Tue Nov  6 13:16:02 2007
@@ -422,7 +422,7 @@
 		if (t->track)
 			ast_mark_lock_acquired();
 	} else if (t->track) {
-			ast_remove_lock_info(&t->mutex);
+		ast_mark_lock_failed();
 	}
 
 	return res;