[asterisk-commits] russell: trunk r114609 - in /trunk: ./ channels/chan_iax2.c

[SVN commits to the Asterisk project]

Author: russell
Date: Thu Apr 24 10:56:55 2008
New Revision: 114609

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

........
r114608 | russell | 2008-04-24 10:55:21 -0500 (Thu, 24 Apr 2008) | 4 lines

Fix a silly mistake in a change I made yesterday that caused chan_iax2 to blow
up very quickly.
(issue #12515)

........

Modified:
    trunk/   (props changed)
    trunk/channels/chan_iax2.c

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

Modified: trunk/channels/chan_iax2.c
URL: http://svn.digium.com/view/asterisk/trunk/channels/chan_iax2.c?view=diff&rev=114609&r1=114608&r2=114609
==============================================================================
--- trunk/channels/chan_iax2.c (original)
+++ trunk/channels/chan_iax2.c Thu Apr 24 10:56:55 2008
@@ -1507,7 +1507,7 @@
 					res = x;
 				}
 			}
-			if (res && !return_locked)
+			if (!res || (res && !return_locked))
 				ast_mutex_unlock(&iaxsl[x]);
 		}
 		for (x=TRUNK_CALL_START;(res < 1) && (x<maxtrunkcall);x++) {
@@ -1518,7 +1518,7 @@
 					res = x;
 				}
 			}
-			if (res && !return_locked)
+			if (!res || (res && !return_locked))
 				ast_mutex_unlock(&iaxsl[x]);
 		}
 	}