[asterisk-commits] russell: branch 1.6.0 r114610 - in /branches/1.6.0: ./ channels/chan_iax2.c

[SVN commits to the Asterisk project]

Author: russell
Date: Thu Apr 24 10:57:24 2008
New Revision: 114610

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

................
r114609 | russell | 2008-04-24 10:56:55 -0500 (Thu, 24 Apr 2008) | 12 lines

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:
    branches/1.6.0/   (props changed)
    branches/1.6.0/channels/chan_iax2.c

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

Modified: branches/1.6.0/channels/chan_iax2.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/channels/chan_iax2.c?view=diff&rev=114610&r1=114609&r2=114610
==============================================================================
--- branches/1.6.0/channels/chan_iax2.c (original)
+++ branches/1.6.0/channels/chan_iax2.c Thu Apr 24 10:57:24 2008
@@ -1500,7 +1500,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++) {
@@ -1511,7 +1511,7 @@
 					res = x;
 				}
 			}
-			if (res && !return_locked)
+			if (!res || (res && !return_locked))
 				ast_mutex_unlock(&iaxsl[x]);
 		}
 	}