[asterisk-commits] mmichelson: branch 1.6.0 r173398 - in /branches/1.6.0: ./ apps/app_chanspy.c

[SVN commits to the Asterisk project]

Author: mmichelson
Date: Wed Feb  4 11:46:12 2009
New Revision: 173398

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

................
r173397 | mmichelson | 2009-02-04 11:45:14 -0600 (Wed, 04 Feb 2009) | 11 lines

Merged revisions 173396 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r173396 | mmichelson | 2009-02-04 11:44:48 -0600 (Wed, 04 Feb 2009) | 3 lines

Revert my previous change because it was stupid


........

................

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/apps/app_chanspy.c

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

Modified: branches/1.6.0/apps/app_chanspy.c
URL: http://svn.digium.com/svn-view/asterisk/branches/1.6.0/apps/app_chanspy.c?view=diff&rev=173398&r1=173397&r2=173398
==============================================================================
--- branches/1.6.0/apps/app_chanspy.c (original)
+++ branches/1.6.0/apps/app_chanspy.c Wed Feb  4 11:46:12 2009
@@ -274,10 +274,8 @@
 	}
 	ast_mutex_unlock(&spyee_chanspy_ds->lock);
 
-	if (!spyee) {
-		ast_channel_unlock(spyee);
+	if (!spyee)
 		return 0;
-	}
 
 	/* We now hold the channel lock on spyee */