[svn-commits] tilghman: branch 1.6.2 r299625 - in /branches/1.6.2: ./ channels/chan_local.c

[SVN commits to the Digium repositories]

Author: tilghman
Date: Sat Dec 25 04:05:00 2010
New Revision: 299625

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

........
  r299624 | tilghman | 2010-12-25 04:04:06 -0600 (Sat, 25 Dec 2010) | 5 lines
  
  Move check for extension existence below variable inheritance, due to the possible use of an eswitch.
  
  (closes issue #16228)
   Reported by: jlaguilar
........

Modified:
    branches/1.6.2/   (props changed)
    branches/1.6.2/channels/chan_local.c

Propchange: branches/1.6.2/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: branches/1.6.2/channels/chan_local.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.2/channels/chan_local.c?view=diff&rev=299625&r1=299624&r2=299625
==============================================================================
--- branches/1.6.2/channels/chan_local.c (original)
+++ branches/1.6.2/channels/chan_local.c Sat Dec 25 04:05:00 2010
@@ -688,12 +688,6 @@
 	ast_cdr_update(p->chan);
 	p->chan->cdrflags = p->owner->cdrflags;
 
-	if (!ast_exists_extension(NULL, p->chan->context, p->chan->exten, 1, p->owner->cid.cid_num)) {
-		ast_log(LOG_NOTICE, "No such extension/context %s@%s while calling Local channel\n", p->chan->exten, p->chan->context);
-		ao2_unlock(p);
-		return -1;
-	}
-
 	/* Make sure we inherit the ANSWERED_ELSEWHERE flag if it's set on the queue/dial call request in the dialplan */
 	if (ast_test_flag(ast, AST_FLAG_ANSWERED_ELSEWHERE)) {
 		ast_set_flag(p->chan, AST_FLAG_ANSWERED_ELSEWHERE);
@@ -711,6 +705,12 @@
 		}
 	}
 	ast_channel_datastore_inherit(p->owner, p->chan);
+
+	if (!ast_exists_extension(p->chan, p->chan->context, p->chan->exten, 1, p->owner->cid.cid_num)) {
+		ast_log(LOG_NOTICE, "No such extension/context %s@%s while calling Local channel\n", p->chan->exten, p->chan->context);
+		ao2_unlock(p);
+		return -1;
+	}
 
 	/* Start switch on sub channel */
 	if (!(res = ast_pbx_start(p->chan)))