[asterisk-commits] dlee: branch dlee/allow-multiple r395414 - /team/dlee/allow-multiple/res/stas...

[SVN commits to the Asterisk project]

Author: dlee
Date: Thu Jul 25 11:09:58 2013
New Revision: 395414

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=395414
Log:
cleanup

Modified:
    team/dlee/allow-multiple/res/stasis_http/resource_bridges.c
    team/dlee/allow-multiple/res/stasis_http/resource_events.c

Modified: team/dlee/allow-multiple/res/stasis_http/resource_bridges.c
URL: http://svnview.digium.com/svn/asterisk/team/dlee/allow-multiple/res/stasis_http/resource_bridges.c?view=diff&rev=395414&r1=395413&r2=395414
==============================================================================
--- team/dlee/allow-multiple/res/stasis_http/resource_bridges.c (original)
+++ team/dlee/allow-multiple/res/stasis_http/resource_bridges.c Thu Jul 25 11:09:58 2013
@@ -165,11 +165,13 @@
 	size_t i;
 
 	if (!bridge) {
+		/* Response filled in by find_bridge */
 		return;
 	}
 
 	list = control_list_create(response, args->channel_count, args->channel);
 	if (!list) {
+		/* Response filled in by control_list_create() */
 		return;
 	}
 
@@ -187,11 +189,13 @@
 	size_t i;
 
 	if (!bridge) {
+		/* Response filled in by find_bridge */
 		return;
 	}
 
 	list = control_list_create(response, args->channel_count, args->channel);
 	if (!list) {
+		/* Response filled in by control_list_create() */
 		return;
 	}
 
@@ -203,8 +207,11 @@
 		if (stasis_app_control_remove_channel_from_bridge(list->controls[i], bridge)) {
 			stasis_http_response_error(response, 500, "Internal Error",
 				"Could not remove channel from bridge");
-			return;
 		}
+	}
+
+	if (response->response_code) {
+		return;
 	}
 
 	stasis_http_response_no_content(response);

Modified: team/dlee/allow-multiple/res/stasis_http/resource_events.c
URL: http://svnview.digium.com/svn/asterisk/team/dlee/allow-multiple/res/stasis_http/resource_events.c?view=diff&rev=395414&r1=395413&r2=395414
==============================================================================
--- team/dlee/allow-multiple/res/stasis_http/resource_events.c (original)
+++ team/dlee/allow-multiple/res/stasis_http/resource_events.c Thu Jul 25 11:09:58 2013
@@ -140,7 +140,7 @@
 	ast_assert(session->ws_session != NULL);
 	ast_assert(session->websocket_apps != NULL);
 
-	if (!app_name) {
+	if (ast_strlen_zero(app_name)) {
 		return -1;
 	}