[svn-commits] qwell: trunk r89249 - in /trunk: ./ res/res_features.c

[SVN commits to the Digium repositories]

Author: qwell
Date: Tue Nov 13 13:48:41 2007
New Revision: 89249

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

(closes issue #11237)
........
r89248 | qwell | 2007-11-13 13:47:45 -0600 (Tue, 13 Nov 2007) | 7 lines

Revert change from revision 67064.
It is documented behavior that if a parking extension already exists while using PARKINGEXTEN,
 dialplan execution will continue.  If blind transferring to a Park with PARKINGEXTEN, you
 must keep this in mind, and handle the failure yourself.

Issue 11237, reported by jon.

........

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=89249&r1=89248&r2=89249
==============================================================================
--- trunk/res/res_features.c (original)
+++ trunk/res/res_features.c Tue Nov 13 13:48:41 2007
@@ -401,7 +401,7 @@
 			AST_LIST_UNLOCK(&parkinglot);
 			ast_free(pu);
 			ast_log(LOG_WARNING, "Requested parking extension already exists: %s@%s\n", parkingexten, parking_con);
-			return -1; /* We failed to park this call, plain and simple so we need to error out */
+			return 0;	/* Continue execution if possible */
 		}
 		ast_copy_string(pu->parkingexten, parkingexten, sizeof(pu->parkingexten));
 		x = atoi(parkingexten);