[asterisk-commits] russell: branch 1.6.0 r109455 - /branches/1.6.0/

[SVN commits to the Asterisk project]

Author: russell
Date: Tue Mar 18 10:53:20 2008
New Revision: 109455

URL: http://svn.digium.com/view/asterisk?view=rev&rev=109455
Log:
Blocked revisions 109169 via svnmerge

........
r109169 | murf | 2008-03-17 12:47:36 -0500 (Mon, 17 Mar 2008) | 20 lines

(closes issue #12238)
Reported by: mvanbaak
Tested by: murf, mvanbaak

Due to a bug that occurred when merge_contexts_and_delete scanned the "old" or existing contexts, and found a context
that doesn't exist in the new set, yet owned by a different registrar. The context is created in the new set, with the
old registrar, and and all the priorities and extens that have a different registrar are copied into it. But, not the
includes, ignorepats, and switches. I added code to do this immediately after the context is created.

This still leaves a logical hole in the code. If you define a context in two places, (eg. in extensions.conf and also 
in extensions.ael), and they both have includes, but different in composition, no new context will be generated, and
therefore the 'old' includes, switches, and ignorepats will not be copied. I'd have added code to simply add any non-duplicates
into the 'new' context that had a different registrar, but there is one big complication: includes, and switches are definitely
order dependent. (ignorepats I'm not sure about). And we'll have to develop some sort of policy about how we 
merge order dependent lists, especially if the intersection of the two sets is empty. (in other words, they do not have any
elements in common). Do the new go first, or the old? I've elected to punt this issue until a user complains. Hopefully,
this is pretty rare thing.



........

Modified:
    branches/1.6.0/   (props changed)

Propchange: branches/1.6.0/
------------------------------------------------------------------------------
--- trunk-blocked (original)
+++ trunk-blocked Tue Mar 18 10:53:20 2008
@@ -1,1 +1,1 @@
-/trunk:105597,105984,106072,106110,106179,106236,106240,106250,106757,107231,107475,107530,107551,107583,107719,107721-107722,107787,107790,107928,108034,108226,108286,108404,108439,108523,108639,108857,108894,108929,109054,109058,109113
+/trunk:105597,105984,106072,106110,106179,106236,106240,106250,106757,107231,107475,107530,107551,107583,107719,107721-107722,107787,107790,107928,108034,108226,108286,108404,108439,108523,108639,108857,108894,108929,109054,109058,109113,109169