diff options
| author | Joshua Colp <jcolp@digium.com> | 2006-11-27 15:33:56 +0000 |
|---|---|---|
| committer | Joshua Colp <jcolp@digium.com> | 2006-11-27 15:33:56 +0000 |
| commit | 237c8be66cc429cc2c199a0772a301d132049c28 (patch) | |
| tree | 09903451490886d5219dd3d866e99dd9db38e556 /pbx | |
| parent | 1b372d1b0fbba2e47e868273a72de5567d95bd75 (diff) | |
Merged revisions 48038 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
................
r48038 | file | 2006-11-27 10:32:19 -0500 (Mon, 27 Nov 2006) | 10 lines
Merged revisions 48037 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r48037 | file | 2006-11-27 10:30:37 -0500 (Mon, 27 Nov 2006) | 2 lines
Do not reference the freed outgoing structure in the debug message. (issue #8425 reported by arkadia)
........
................
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@48039 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'pbx')
| -rw-r--r-- | pbx/pbx_spool.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pbx/pbx_spool.c b/pbx/pbx_spool.c index d9b0eac6a..2293ca9ab 100644 --- a/pbx/pbx_spool.c +++ b/pbx/pbx_spool.c @@ -387,8 +387,8 @@ static int scan_service(char *fn, time_t now, time_t atime) now += o->retrytime; if (o->callingpid && (o->callingpid == ast_mainpid)) { safe_append(o, time(NULL), "DelayedRetry"); - free_outgoing(o); ast_log(LOG_DEBUG, "Delaying retry since we're currently running '%s'\n", o->fn); + free_outgoing(o); } else { /* Increment retries */ o->retries++; |