diff options
| author | Jenkins2 <jenkins2@gerrit.asterisk.org> | 2018-01-08 11:13:21 -0600 |
|---|---|---|
| committer | Gerrit Code Review <gerrit2@gerrit.digium.api> | 2018-01-08 11:13:21 -0600 |
| commit | 7cc614d22363398747bd2c1aa81d3422cf2d07c5 (patch) | |
| tree | 7fe7acb87c3abea6b837adeab655f6a96339c7ec | |
| parent | b6b1d73cb5c6fe45c34b7b6dbc930d555dfc257f (diff) | |
| parent | c1acc4f3647ce65fa627c06bbd03a92a9ccc8d48 (diff) | |
Merge "res_stasis: Fix app_is_subscribed_bridge_id." into 13
| -rw-r--r-- | res/stasis/app.c | 16 |
1 files changed, 3 insertions, 13 deletions
diff --git a/res/stasis/app.c b/res/stasis/app.c index 5366819b6..91b006572 100644 --- a/res/stasis/app.c +++ b/res/stasis/app.c @@ -1432,25 +1432,15 @@ int app_unsubscribe_bridge_id(struct stasis_app *app, const char *bridge_id) int app_is_subscribed_bridge_id(struct stasis_app *app, const char *bridge_id) { struct app_forwards *forwards; - SCOPED_AO2LOCK(lock, app->forwards); - - forwards = ao2_find(app->forwards, BRIDGE_ALL, OBJ_SEARCH_KEY | OBJ_NOLOCK); - if (forwards) { - ao2_ref(forwards, -1); - return 1; - } if (ast_strlen_zero(bridge_id)) { bridge_id = BRIDGE_ALL; } - forwards = ao2_find(app->forwards, bridge_id, OBJ_SEARCH_KEY | OBJ_NOLOCK); - if (forwards) { - ao2_ref(forwards, -1); - return 1; - } + forwards = ao2_find(app->forwards, bridge_id, OBJ_SEARCH_KEY); + ao2_cleanup(forwards); - return 0; + return forwards != NULL; } static void *bridge_find(const struct stasis_app *app, const char *id) |