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

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">astobj2: Fix shutdown order.<br><br>When REF_DEBUG and AO2_DEBUG are both enabled we closed the refs log<br>before we shutdown astobj2_container.  This caused the AO2_DEBUG<br>container registration container to be reported as a leak.<br><br>Change-Id: If9111c4c21c68064b22c546d5d7a41fac430430e<br>---<br>M main/astobj2.c<br>1 file changed, 3 insertions(+), 2 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/main/astobj2.c b/main/astobj2.c</span><br><span>index 63058e1..91ebc1e 100644</span><br><span>--- a/main/astobj2.c</span><br><span>+++ b/main/astobj2.c</span><br><span>@@ -1193,8 +1193,11 @@</span><br><span>            }</span><br><span>    }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ ast_register_cleanup(astobj2_cleanup);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span>     if (container_init() != 0) {</span><br><span>                 fclose(ref_log);</span><br><span style="color: hsl(120, 100%, 40%);">+              ref_log = NULL;</span><br><span>              return -1;</span><br><span>   }</span><br><span> </span><br><span>@@ -1202,7 +1205,5 @@</span><br><span>        ast_cli_register_multiple(cli_astobj2, ARRAY_LEN(cli_astobj2));</span><br><span> #endif       /* defined(AO2_DEBUG) */</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-    ast_register_cleanup(astobj2_cleanup);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span>       return 0;</span><br><span> }</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.asterisk.org/10297">change 10297</a>. To unsubscribe, or for help writing mail filters, 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/10297"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: asterisk </div>
<div style="display:none"> Gerrit-Branch: 15 </div>
<div style="display:none"> Gerrit-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: If9111c4c21c68064b22c546d5d7a41fac430430e </div>
<div style="display:none"> Gerrit-Change-Number: 10297 </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: George Joseph <gjoseph@digium.com> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins2 (1000185) </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>