[asterisk-commits] russell: branch 1.6.1 r179905 - in /branches/1.6.1: ./ apps/

[SVN commits to the Asterisk project]

Author: russell
Date: Tue Mar  3 14:09:59 2009
New Revision: 179905

URL: http://svn.digium.com/svn-view/asterisk?view=rev&rev=179905
Log:
Merged revisions 179903 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

........
r179903 | bmd | 2009-03-03 14:02:20 -0600 (Tue, 03 Mar 2009) | 1 line

fix a leaked channel lock (and future deadlock) when we try to pick up our own channel
........

Modified:
    branches/1.6.1/   (props changed)
    branches/1.6.1/apps/app_directed_pickup.c

Propchange: branches/1.6.1/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.1/apps/app_directed_pickup.c
URL: http://svn.digium.com/svn-view/asterisk/branches/1.6.1/apps/app_directed_pickup.c?view=diff&rev=179905&r1=179904&r2=179905
==============================================================================
--- branches/1.6.1/apps/app_directed_pickup.c (original)
+++ branches/1.6.1/apps/app_directed_pickup.c Tue Mar  3 14:09:59 2009
@@ -131,8 +131,8 @@
 	/* Just check that we are not picking up the SAME as target */
 	if (chan->name != target->name && chan != target) {
 		res = pickup_do(chan, target);
-		ast_channel_unlock(target);
-	}
+	}
+	ast_channel_unlock(target);
 
 	return res;
 }