[svn-commits] jpeeler: trunk r294314 - in /trunk: ./ res/res_timing_timerfd.c

[SVN commits to the Digium repositories]

Author: jpeeler
Date: Mon Nov  8 16:33:01 2010
New Revision: 294314

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

................
  r294313 | jpeeler | 2010-11-08 16:32:13 -0600 (Mon, 08 Nov 2010) | 9 lines
  
  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:
    trunk/   (props changed)
    trunk/res/res_timing_timerfd.c

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

Modified: trunk/res/res_timing_timerfd.c
URL: http://svnview.digium.com/svn/asterisk/trunk/res/res_timing_timerfd.c?view=diff&rev=294314&r1=294313&r2=294314
==============================================================================
--- trunk/res/res_timing_timerfd.c (original)
+++ trunk/res/res_timing_timerfd.c Mon Nov  8 16:33:01 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;
 	}