[svn-commits] russell: trunk r317481 - in /trunk: ./ cdr/cdr_syslog.c

[SVN commits to the Digium repositories]

Author: russell
Date: Thu May  5 18:02:11 2011
New Revision: 317481

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=317481
Log:
Merged revisions 317480 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r317480 | russell | 2011-05-05 18:00:55 -0500 (Thu, 05 May 2011) | 8 lines
  
  Don't lose cdr_syslog config on a reload.
  
  (closes issue #18679)
  Reported by: enegaard
  Patches:
        issue18679_seanbright.patch uploaded by seanbright (license 71)
  Tested by: enegaard
........

Modified:
    trunk/   (props changed)
    trunk/cdr/cdr_syslog.c

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

Modified: trunk/cdr/cdr_syslog.c
URL: http://svnview.digium.com/svn/asterisk/trunk/cdr/cdr_syslog.c?view=diff&rev=317481&r1=317480&r2=317481
==============================================================================
--- trunk/cdr/cdr_syslog.c (original)
+++ trunk/cdr/cdr_syslog.c Thu May  5 18:02:11 2011
@@ -264,8 +264,10 @@
 		return AST_MODULE_LOAD_DECLINE;
 	}
 
-	free_config();
-	res = load_config(1);
+	if ((res = load_config(1))) {
+		free_config();
+	}
+
 	AST_RWLIST_UNLOCK(&sinks);
 
 	return res ? AST_MODULE_LOAD_DECLINE : AST_MODULE_LOAD_SUCCESS;