Merge branch 'master' of git.freeswitch.org:freeswitch

src/mod/applications/mod_fsk/mod_fsk.c

@@ -370,7 +370,7 @@ SWITCH_STANDARD_APP(fsk_display_function)
 	const char *cid_name, *cid_num;
 	switch_channel_t *channel = switch_core_session_get_channel(session);
 	switch_core_session_message_t *msg;
-	switch_core_session_t *psession, *usession = NULL;
+	switch_core_session_t *psession = NULL, *usession = NULL;
 	char *flags = (char *) data;
 
 	cid_name = switch_channel_get_variable(channel, "fsk_phone_name");

src/mod/event_handlers/mod_json_cdr/mod_json_cdr.c

@@ -603,12 +603,7 @@ SWITCH_MODULE_LOAD_FUNCTION(mod_json_cdr_load)
 		}
 	}
 
-	if (globals.retries < 0) {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Retries is negative, setting to 0\n");
-		globals.retries = 0;
-	}
-
-	if (globals.retries && globals.delay <= 0) {
+	if (globals.retries && globals.delay) {
 		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Retries set but delay 0 setting to 5000ms\n");
 		globals.delay = 5000;
 	}