<p>Jenkins2 <strong>merged</strong> this change.</p><p><a href="https://gerrit.asterisk.org/7868">View Change</a></p><div style="white-space:pre-wrap">Approvals:
  Joshua Colp: Looks good to me, but someone else must approve
  Benjamin Keith Ford: Looks good to me, but someone else must approve
  Richard Mudgett: Looks good to me, approved
  Jenkins2: Approved for Submit

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">res_stasis: Fix app_is_subscribed_bridge_id.<br><br>Instead of searching for bridge_id provided in an argument this function<br>always searched for BRIDGE_ALL first.  Rewrite this function to work<br>like the similar functions for channel and endpoint functions.<br><br>Change-Id: Ib5caca69e11727c5c8a7284a1d00621f40f1e60a<br>---<br>M res/stasis/app.c<br>1 file changed, 3 insertions(+), 13 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">diff --git a/res/stasis/app.c b/res/stasis/app.c<br>index 5366819..91b0065 100644<br>--- a/res/stasis/app.c<br>+++ b/res/stasis/app.c<br>@@ -1432,25 +1432,15 @@<br> int app_is_subscribed_bridge_id(struct stasis_app *app, const char *bridge_id)<br> {<br>        struct app_forwards *forwards;<br>-       SCOPED_AO2LOCK(lock, app->forwards);<br>-<br>-   forwards = ao2_find(app->forwards, BRIDGE_ALL, OBJ_SEARCH_KEY | OBJ_NOLOCK);<br>-      if (forwards) {<br>-              ao2_ref(forwards, -1);<br>-               return 1;<br>-    }<br> <br>  if (ast_strlen_zero(bridge_id)) {<br>             bridge_id = BRIDGE_ALL;<br>       }<br> <br>- forwards = ao2_find(app->forwards, bridge_id, OBJ_SEARCH_KEY | OBJ_NOLOCK);<br>-       if (forwards) {<br>-              ao2_ref(forwards, -1);<br>-               return 1;<br>-    }<br>+    forwards = ao2_find(app->forwards, bridge_id, OBJ_SEARCH_KEY);<br>+    ao2_cleanup(forwards);<br> <br>-    return 0;<br>+    return forwards != NULL;<br> }<br> <br> static void *bridge_find(const struct stasis_app *app, const char *id)<br></pre><p>To view, visit <a href="https://gerrit.asterisk.org/7868">change 7868</a>. To unsubscribe, visit <a href="https://gerrit.asterisk.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.asterisk.org/7868"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: asterisk </div>
<div style="display:none"> Gerrit-Branch: 13 </div>
<div style="display:none"> Gerrit-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: Ib5caca69e11727c5c8a7284a1d00621f40f1e60a </div>
<div style="display:none"> Gerrit-Change-Number: 7868 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Corey Farrell <git@cfware.com> </div>
<div style="display:none"> Gerrit-Reviewer: Benjamin Keith Ford <bford@digium.com> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins2 </div>
<div style="display:none"> Gerrit-Reviewer: Joshua Colp <jcolp@digium.com> </div>
<div style="display:none"> Gerrit-Reviewer: Richard Mudgett <rmudgett@digium.com> </div>