[asterisk-commits] sgriepentrog: branch sgriepentrog/12-userevent r413028 - in /team/sgriepentro...

[SVN commits to the Asterisk project]

Author: sgriepentrog
Date: Fri Apr 25 17:45:07 2014
New Revision: 413028

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=413028
Log:
userevent: fixed leak, eod

Modified:
    team/sgriepentrog/12-userevent/main/stasis_user.c
    team/sgriepentrog/12-userevent/res/res_stasis.c

Modified: team/sgriepentrog/12-userevent/main/stasis_user.c
URL: http://svnview.digium.com/svn/asterisk/team/sgriepentrog/12-userevent/main/stasis_user.c?view=diff&rev=413028&r1=413027&r2=413028
==============================================================================
--- team/sgriepentrog/12-userevent/main/stasis_user.c (original)
+++ team/sgriepentrog/12-userevent/main/stasis_user.c Fri Apr 25 17:45:07 2014
@@ -279,10 +279,9 @@
 			json_object = ast_endpoint_snapshot_to_json(mos->snapshot, sanitize);
 			break;
 		}
-		if (!json_object) {
-			continue;
-		}
-		ast_json_object_set(out, mos->key.name, json_object);
+		if (json_object) {
+			ast_json_object_set(out, mos->key.name, json_object);
+		}
 		ao2_cleanup(mos);
 	}
 	ao2_iterator_destroy(&it_snapshots);

Modified: team/sgriepentrog/12-userevent/res/res_stasis.c
URL: http://svnview.digium.com/svn/asterisk/team/sgriepentrog/12-userevent/res/res_stasis.c?view=diff&rev=413028&r1=413027&r2=413028
==============================================================================
--- team/sgriepentrog/12-userevent/res/res_stasis.c (original)
+++ team/sgriepentrog/12-userevent/res/res_stasis.c Fri Apr 25 17:45:07 2014
@@ -1395,12 +1395,10 @@
 	//ao2_ref(message, +1);
 	stasis_publish(ast_app_get_topic(app), message);
 
-	/*
 	if (have_channel) {
 		//ao2_ref(message, +1);
 		stasis_publish(ast_manager_get_topic(), message);
 	}
-	*/
 
 	return STASIS_AGER_OK;
 }