<p>Jenkins2 <strong>merged</strong> this change.</p><p><a href="https://gerrit.asterisk.org/8150">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Richard Mudgett: Looks good to me, but someone else must approve
Sean Bright: Looks good to me, but someone else must approve
Kevin Harwell: Looks good to me, approved
Jenkins2: Approved for Submit
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">manager.c: Fixed "(null):" header in AMI AsyncAGIEnd event<br><br>* Changed to create ami_event string only when the given blob is not<br>json_null().<br>* Fixed bad expression.<br><br>ASTERISK-27621<br><br>Change-Id: Ice58c16361f9d9e8648261c9ed5d6c8245fb0d8f<br>---<br>M main/manager.c<br>1 file changed, 11 insertions(+), 3 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">diff --git a/main/manager.c b/main/manager.c<br>index 576978c..da860f0 100644<br>--- a/main/manager.c<br>+++ b/main/manager.c<br>@@ -1770,7 +1770,12 @@<br> {<br> struct ast_json_iter *i;<br> <br>- if (!obj || (!res && !(*res) && (!(*res = ast_str_create(1024))))) {<br>+ /* If obj or res is not given, just return */<br>+ if (!obj || !res) {<br>+ return;<br>+ }<br>+<br>+ if (!*res && !(*res = ast_str_create(1024))) {<br> return;<br> }<br> <br>@@ -1801,11 +1806,14 @@<br> }<br> }<br> <br>-<br> struct ast_str *ast_manager_str_from_json_object(struct ast_json *blob, key_exclusion_cb exclusion_cb)<br> {<br> struct ast_str *res = ast_str_create(1024);<br>- manager_json_to_ast_str(blob, NULL, &res, exclusion_cb);<br>+<br>+ if (!ast_json_is_null(blob)) {<br>+ manager_json_to_ast_str(blob, NULL, &res, exclusion_cb);<br>+ }<br>+<br> return res;<br> }<br> <br></pre><p>To view, visit <a href="https://gerrit.asterisk.org/8150">change 8150</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/8150"/><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: Ice58c16361f9d9e8648261c9ed5d6c8245fb0d8f </div>
<div style="display:none"> Gerrit-Change-Number: 8150 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: sungtae kim <pchero21@gmail.com> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins2 </div>
<div style="display:none"> Gerrit-Reviewer: Kevin Harwell <kharwell@digium.com> </div>
<div style="display:none"> Gerrit-Reviewer: Richard Mudgett <rmudgett@digium.com> </div>
<div style="display:none"> Gerrit-Reviewer: Sean Bright <sean.bright@gmail.com> </div>