[svn-commits] coreyfarrell: trunk r434026 - in /trunk: ./ res/res_pjsip_phoneprov_provider.c

[SVN commits to the Digium repositories]

Author: coreyfarrell
Date: Mon Apr  6 10:17:18 2015
New Revision: 434026

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=434026
Log:
res_pjsip_phoneprov_provider: Revert 433996 / 433997.

res_pjsip_phoneprov_provider is using ao2_callback with OBJ_MULTIPLE, then
ignoring the return.  OBJ_NODATA flag was to prevent a reference leak, but
this caused the module to FRACK on unload.  Revert change until this can
be investigated further.

ASTERISK-24935
Reported by: Corey Farrell
Review: https://reviewboard.asterisk.org/r/4578/
........

Merged revisions 434025 from http://svn.asterisk.org/svn/asterisk/branches/13

Modified:
    trunk/   (props changed)
    trunk/res/res_pjsip_phoneprov_provider.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-13-merged' - no diff available.

Modified: trunk/res/res_pjsip_phoneprov_provider.c
URL: http://svnview.digium.com/svn/asterisk/trunk/res/res_pjsip_phoneprov_provider.c?view=diff&rev=434026&r1=434025&r2=434026
==============================================================================
--- trunk/res/res_pjsip_phoneprov_provider.c (original)
+++ trunk/res/res_pjsip_phoneprov_provider.c Mon Apr  6 10:17:18 2015
@@ -353,7 +353,7 @@
 		return 0;
 	}
 
-	ao2_callback(users, OBJ_MULTIPLE | OBJ_NODATA, users_apply_handler, sorcery);
+	ao2_callback(users, OBJ_MULTIPLE, users_apply_handler, sorcery);
 	ao2_ref(users, -1);
 
 	return 0;