[asterisk-commits] mjordan: trunk r424987 - in /trunk: ./ res/res_phoneprov.c

[SVN commits to the Asterisk project]

Author: mjordan
Date: Thu Oct  9 13:44:00 2014
New Revision: 424987

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=424987
Log:
res/res_phoneprov: Don't cancel Asterisk load on module load failure
........

Merged revisions 424985 from http://svn.asterisk.org/svn/asterisk/branches/12
........

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

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

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

Modified: trunk/res/res_phoneprov.c
URL: http://svnview.digium.com/svn/asterisk/trunk/res/res_phoneprov.c?view=diff&rev=424987&r1=424986&r2=424987
==============================================================================
--- trunk/res/res_phoneprov.c (original)
+++ trunk/res/res_phoneprov.c Thu Oct  9 13:44:00 2014
@@ -1376,7 +1376,7 @@
 	profiles = ao2_container_alloc(MAX_PROFILE_BUCKETS, phone_profile_hash_fn, phone_profile_cmp_fn);
 	if (!profiles) {
 		ast_log(LOG_ERROR, "Unable to allocate profiles container.\n");
-		return -1;
+		return AST_MODULE_LOAD_DECLINE;
 	}
 
 	http_routes = ao2_container_alloc(MAX_ROUTE_BUCKETS, http_route_hash_fn, http_route_cmp_fn);
@@ -1424,7 +1424,7 @@
 	ao2_cleanup(users);
 	delete_providers();
 	ao2_cleanup(providers);
-	return -1;
+	return AST_MODULE_LOAD_DECLINE;
 
 }