[asterisk-commits] jpeeler: branch 1.8 r294313 - in /branches/1.8: ./ res/res_timing_timerfd.c

[SVN commits to the Asterisk project]

Author: jpeeler
Date: Mon Nov  8 16:32:13 2010
New Revision: 294313

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=294313
Log:
Merged revisions 294312 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.6.2

........
  r294312 | jpeeler | 2010-11-08 16:30:49 -0600 (Mon, 08 Nov 2010) | 1 line
  
  add missing unlock not present in 294277
........

Modified:
    branches/1.8/   (props changed)
    branches/1.8/res/res_timing_timerfd.c

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

Modified: branches/1.8/res/res_timing_timerfd.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.8/res/res_timing_timerfd.c?view=diff&rev=294313&r1=294312&r2=294313
==============================================================================
--- branches/1.8/res/res_timing_timerfd.c (original)
+++ branches/1.8/res/res_timing_timerfd.c Mon Nov  8 16:32:13 2010
@@ -228,6 +228,7 @@
 		/* No reason to do anything if we're not
 		 * in continuous mode
 		 */
+		ao2_unlock(our_timer);
 		ao2_ref(our_timer, -1);
 		return 0;
 	}