Merged revisions 106896 via svnmerge from

https://origsvn.digium.com/svn/asterisk/trunk

................
r106896 | russell | 2008-03-07 16:52:46 -0600 (Fri, 07 Mar 2008) | 10 lines

Merged revisions 106895 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r106895 | russell | 2008-03-07 16:51:23 -0600 (Fri, 07 Mar 2008) | 2 lines

Only start the SLA thread if SLA has actually been configured.

........

................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@106897 65c4cc65-6c06-0410-ace0-fbb531ad65f3
1.6.0
Russell Bryant 17 years ago
parent 254ea518ef
commit 265c460d19

@ -5510,7 +5510,7 @@ static int sla_load_config(int reload)
ast_config_destroy(cfg);
if (!reload)
if (!reload && (!AST_LIST_EMPTY(&sla_stations) || !AST_LIST_EMPTY(&sla_stations)))
ast_pthread_create(&sla.thread, NULL, sla_thread, NULL);
return res;

Loading…
Cancel
Save