[asterisk-commits] file: trunk r67065 - in /trunk: ./ res/res_features.c

[asterisk-commits at lists.digium.com]

Author: file
Date: Mon Jun  4 12:43:21 2007
New Revision: 67065

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

........
r67064 | file | 2007-06-04 13:41:59 -0400 (Mon, 04 Jun 2007) | 2 lines

Returning a value that indicates the parking of a call was a success when it really wasn't (because the parking slot selected was in use) is the wrong thing to do. (issue #9723 reported by mdu113)

........

Modified:
    trunk/   (props changed)
    trunk/res/res_features.c

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

Modified: trunk/res/res_features.c
URL: http://svn.digium.com/view/asterisk/trunk/res/res_features.c?view=diff&rev=67065&r1=67064&r2=67065
==============================================================================
--- trunk/res/res_features.c (original)
+++ trunk/res/res_features.c Mon Jun  4 12:43:21 2007
@@ -377,7 +377,7 @@
 			ast_mutex_unlock(&parking_lock);
 			free(pu);
 			ast_log(LOG_WARNING, "Requested parking extension already exists: %s@%s\n", parkingexten, parking_con);
-			return 0;	/* Continue execution if possible */
+			return -1; /* We failed to park this call, plain and simple so we need to error out */
 		}
 		ast_copy_string(pu->parkingexten, parkingexten, sizeof(pu->parkingexten));
 		x = atoi(parkingexten);