Merge branch 'master' into master-indexinfo-imp

# Conflicts:
#	Orm/Xtensive.Orm/Orm/Building/Builders/IndexBuilder.cs
#	Orm/Xtensive.Orm/Orm/Model/IndexInfo.cs

Author: alex-kulakov

Orm/Xtensive.Orm/Orm/Building/Builders/IndexBuilder.ConcreteTable.cs

@@ -34,7 +34,7 @@ private void BuildConcreteTableIndexes(TypeInfo type)
           continue;
         }
 
-        var declaredIndex = BuildIndex(type, indexDescriptor, type.IsAbstract); 
+        var declaredIndex = BuildIndex(type, indexDescriptor, type.IsAbstract);
         type.Indexes.Add(declaredIndex);
         if (!declaredIndex.IsAbstract) {
           context.Model.RealIndexes.Add(declaredIndex);
@@ -46,7 +46,7 @@ private void BuildConcreteTableIndexes(TypeInfo type)
       if (parent != null) {
         var parentPrimaryIndex = parent.Indexes.FindFirst(IndexAttributes.Primary | IndexAttributes.Real);
         var inheritedIndex = BuildInheritedIndex(type, parentPrimaryIndex, type.IsAbstract);
-       
+
         // Registering built primary index
         type.Indexes.Add(inheritedIndex);
         if (!inheritedIndex.IsAbstract) {
@@ -63,6 +63,7 @@ private void BuildConcreteTableIndexes(TypeInfo type)
 
           var index = BuildInheritedIndex(type, parentIndex, type.IsAbstract);
           if ((parent != null && parent.Indexes.Contains(index.Name)) || type.Indexes.Contains(index.Name)) {
+            index.Dispose();
             continue;
           }
 

Orm/Xtensive.Orm/Orm/Building/Builders/IndexBuilder.cs

@@ -92,6 +92,7 @@ private void CreateInterfaceIndexes(TypeInfo @interface, ICollection<TypeInfo> p
         foreach (var parentIndex in parent.Indexes.Find(IndexAttributes.Primary, MatchType.None).ToChainedBuffer()) {
           var index = BuildInheritedIndex(@interface, parentIndex, false);
           if (@interface.Indexes.Contains(index.Name)) {
+            index.Dispose();
             continue;
           }
 
@@ -201,8 +202,10 @@ private void BuildInterfaceIndexes()
             }
             underlyingIndexes.Add(underlyingIndex);
           }
-          if (underlyingIndexes.Count == 1)
+          if (underlyingIndexes.Count == 1) {
+            index.Dispose();
             index = underlyingIndexes.First();
+          }
           else
             index.UnderlyingIndexes.AddRange(underlyingIndexes);
 

Orm/Xtensive.Orm/Orm/Model/FieldInfo.cs

@@ -675,6 +675,7 @@ public override void Lock(bool recursive)
         column.Lock(true);
       if (associations.Count > 1) {
         var sorted = associations.Reorder();
+        associations.Clear();
         associations = new NodeCollection<AssociationInfo>(associations.Owner, associations.Name);
         associations.AddRange(sorted);
       }