[asterisk-commits] file: trunk r402140 - in /trunk: ./ res/ rest-api/api-docs/

[SVN commits to the Asterisk project]

Author: file
Date: Tue Oct 29 06:15:59 2013
New Revision: 402140

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=402140
Log:
res_ari_playback: Add missing 404 error response for GET and DELETE.

(closes issue ASTERISK-22722)
Reported by: Richard Mudgett
........

Merged revisions 402139 from http://svn.asterisk.org/svn/asterisk/branches/12

Modified:
    trunk/   (props changed)
    trunk/res/res_ari_playback.c
    trunk/rest-api/api-docs/playback.json

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

Modified: trunk/res/res_ari_playback.c
URL: http://svnview.digium.com/svn/asterisk/trunk/res/res_ari_playback.c?view=diff&rev=402140&r1=402139&r2=402140
==============================================================================
--- trunk/res/res_ari_playback.c (original)
+++ trunk/res/res_ari_playback.c Tue Oct 29 06:15:59 2013
@@ -85,6 +85,7 @@
 		break;
 	case 500: /* Internal Server Error */
 	case 501: /* Not Implemented */
+	case 404: /* The playback cannot be found */
 		is_valid = 1;
 		break;
 	default:
@@ -141,6 +142,7 @@
 		break;
 	case 500: /* Internal Server Error */
 	case 501: /* Not Implemented */
+	case 404: /* The playback cannot be found */
 		is_valid = 1;
 		break;
 	default:

Modified: trunk/rest-api/api-docs/playback.json
URL: http://svnview.digium.com/svn/asterisk/trunk/rest-api/api-docs/playback.json?view=diff&rev=402140&r1=402139&r2=402140
==============================================================================
--- trunk/rest-api/api-docs/playback.json (original)
+++ trunk/rest-api/api-docs/playback.json Tue Oct 29 06:15:59 2013
@@ -25,6 +25,12 @@
 							"allowMultiple": false,
 							"dataType": "string"
 						}
+					],
+					"errorResponses": [
+						{
+							"code": 404,
+							"reason": "The playback cannot be found"
+						}
 					]
 				},
 				{
@@ -40,6 +46,12 @@
 							"required": true,
 							"allowMultiple": false,
 							"dataType": "string"
+						}
+					],
+					"errorResponses": [
+						{
+							"code": 404,
+							"reason": "The playback cannot be found"
 						}
 					]
 				}