Replace array concatenation with hand written append

hazzik · hazzik · commit 9575f6144d11 · 2019-04-16T17:45:10.000+12:00
diff --git a/src/NHibernate/Mapping/ByCode/Impl/ClassMapper.cs b/src/NHibernate/Mapping/ByCode/Impl/ClassMapper.cs
@@ -4,6 +4,7 @@
 using System.Reflection;
 using NHibernate.Cfg.MappingSchema;
 using NHibernate.Persister.Entity;
+using NHibernate.Util;
 
 namespace NHibernate.Mapping.ByCode.Impl
 {
@@ -24,7 +25,6 @@ public ClassMapper(System.Type rootClass, HbmMapping mapDoc, MemberInfo idProper
 			: base(rootClass, mapDoc)
 		{
 			classMapping = new HbmClass();
-			var toAdd = new[] {classMapping};
 			classMapping.name = rootClass.GetShortClassName(mapDoc);
 			if (rootClass.IsAbstract)
 			{
@@ -36,7 +36,7 @@ public ClassMapper(System.Type rootClass, HbmMapping mapDoc, MemberInfo idProper
 			classMapping.Item = hbmId;
 			idMapper = new IdMapper(idProperty, hbmId);
 
-			mapDoc.Items = mapDoc.Items == null ? toAdd : mapDoc.Items.Concat(toAdd).ToArray();
+			mapDoc.Items = ArrayHelper.Append(mapDoc.Items, classMapping);
 		}
 
 		#region Overrides of AbstractPropertyContainerMapper
@@ -47,8 +47,7 @@ protected override void AddProperty(object property)
 			{
 				throw new ArgumentNullException("property");
 			}
-			var toAdd = new[] {property};
-			classMapping.Items = classMapping.Items == null ? toAdd : classMapping.Items.Concat(toAdd).ToArray();
+			classMapping.Items = ArrayHelper.Append(classMapping.Items, property);
 		}
 
 		#endregion
@@ -258,9 +257,8 @@ public void Join(string splitGroupId, Action<IJoinMapper> splitMapping)
 			{
 				var hbmJoin = new HbmJoin();
 				splitGroup = new JoinMapper(Container, splitGroupId, hbmJoin, MapDoc);
-				var toAdd = new[] { hbmJoin };
 				JoinMappers.Add(splitGroupId, splitGroup);
-				classMapping.Items1 = classMapping.Items1 == null ? toAdd : classMapping.Items1.Concat(toAdd).ToArray();
+				classMapping.Items1 = ArrayHelper.Append(classMapping.Items1, hbmJoin);
 			}
 
 			splitMapping(splitGroup);
@@ -391,4 +389,4 @@ public void Subselect(string sql)
 
 		#endregion
 	}
-}
+}
diff --git a/src/NHibernate/Mapping/ByCode/Impl/ComponentAsIdMapper.cs b/src/NHibernate/Mapping/ByCode/Impl/ComponentAsIdMapper.cs
@@ -1,7 +1,7 @@
 using System;
-using System.Linq;
 using System.Reflection;
 using NHibernate.Cfg.MappingSchema;
+using NHibernate.Util;
 
 namespace NHibernate.Mapping.ByCode.Impl
 {
@@ -65,8 +65,7 @@ protected void AddProperty(object property)
 			{
 				throw new ArgumentNullException("property");
 			}
-			var toAdd = new[] { property };
-			id.Items = id.Items == null ? toAdd : id.Items.Concat(toAdd).ToArray();
+			id.Items = ArrayHelper.Append(id.Items, property);
 		}
 	}
-}
+}
diff --git a/src/NHibernate/Mapping/ByCode/Impl/ComponentElementMapper.cs b/src/NHibernate/Mapping/ByCode/Impl/ComponentElementMapper.cs
@@ -1,7 +1,7 @@
 using System;
-using System.Linq;
 using System.Reflection;
 using NHibernate.Cfg.MappingSchema;
+using NHibernate.Util;
 
 namespace NHibernate.Mapping.ByCode.Impl
 {
@@ -110,8 +110,7 @@ protected void AddProperty(object property)
 			{
 				throw new ArgumentNullException("property");
 			}
-			var toAdd = new[] { property };
-			_component.Items = _component.Items == null ? toAdd : _component.Items.Concat(toAdd).ToArray();
+			_component.Items = ArrayHelper.Append(_component.Items, property);
 		}
 
 		private IComponentParentMapper GetParentMapper(MemberInfo parent)
@@ -124,4 +123,4 @@ private IComponentParentMapper GetParentMapper(MemberInfo parent)
 			return _parentMapper = new ComponentParentMapper(_component.parent, parent);
 		}
 	}
-}
+}
diff --git a/src/NHibernate/Mapping/ByCode/Impl/ComponentMapKeyMapper.cs b/src/NHibernate/Mapping/ByCode/Impl/ComponentMapKeyMapper.cs
@@ -1,7 +1,7 @@
 using System;
-using System.Linq;
 using System.Reflection;
 using NHibernate.Cfg.MappingSchema;
+using NHibernate.Util;
 
 namespace NHibernate.Mapping.ByCode.Impl
 {
@@ -46,8 +46,7 @@ protected void AddProperty(object property)
 			{
 				throw new ArgumentNullException("property");
 			}
-			var toAdd = new[] {property};
-			component.Items = component.Items == null ? toAdd : component.Items.Concat(toAdd).ToArray();
+			component.Items = ArrayHelper.Append(component.Items, property);
 		}
 	}
-}
+}
diff --git a/src/NHibernate/Mapping/ByCode/Impl/ComponentMapper.cs b/src/NHibernate/Mapping/ByCode/Impl/ComponentMapper.cs
@@ -2,6 +2,7 @@
 using System.Linq;
 using System.Reflection;
 using NHibernate.Cfg.MappingSchema;
+using NHibernate.Util;
 
 namespace NHibernate.Mapping.ByCode.Impl
 {
@@ -32,8 +33,7 @@ protected override void AddProperty(object property)
 			{
 				throw new ArgumentNullException("property");
 			}
-			var toAdd = new[] {property};
-			_component.Items = _component.Items == null ? toAdd : _component.Items.Concat(toAdd).ToArray();
+			_component.Items = ArrayHelper.Append(_component.Items, property);
 		}
 
 		#endregion
diff --git a/src/NHibernate/Mapping/ByCode/Impl/ComponentNestedElementMapper.cs b/src/NHibernate/Mapping/ByCode/Impl/ComponentNestedElementMapper.cs
@@ -2,6 +2,7 @@
 using System.Linq;
 using System.Reflection;
 using NHibernate.Cfg.MappingSchema;
+using NHibernate.Util;
 
 namespace NHibernate.Mapping.ByCode.Impl
 {
@@ -112,8 +113,7 @@ protected void AddProperty(object property)
 			{
 				throw new ArgumentNullException("property");
 			}
-			var toAdd = new[] { property };
-			_component.Items = _component.Items == null ? toAdd : _component.Items.Concat(toAdd).ToArray();
+			_component.Items = ArrayHelper.Append(_component.Items, property);
 		}
 
 		private IComponentParentMapper GetParentMapper(MemberInfo parent)
@@ -126,4 +126,4 @@ private IComponentParentMapper GetParentMapper(MemberInfo parent)
 			return _parentMapper = new ComponentParentMapper(_component.parent, parent);
 		}
 	}
-}
+}
diff --git a/src/NHibernate/Mapping/ByCode/Impl/ComposedIdMapper.cs b/src/NHibernate/Mapping/ByCode/Impl/ComposedIdMapper.cs
@@ -2,6 +2,7 @@
 using System.Linq;
 using System.Reflection;
 using NHibernate.Cfg.MappingSchema;
+using NHibernate.Util;
 
 namespace NHibernate.Mapping.ByCode.Impl
 {
@@ -47,8 +48,7 @@ protected void AddProperty(object property)
 			{
 				throw new ArgumentNullException("property");
 			}
-			var toAdd = new[] {property};
-			id.Items = id.Items == null ? toAdd : id.Items.Concat(toAdd).ToArray();
+			id.Items = ArrayHelper.Append(id.Items, property);
 		}
 	}
-}
+}
diff --git a/src/NHibernate/Mapping/ByCode/Impl/DynamicComponentMapper.cs b/src/NHibernate/Mapping/ByCode/Impl/DynamicComponentMapper.cs
@@ -2,6 +2,7 @@
 using System.Linq;
 using System.Reflection;
 using NHibernate.Cfg.MappingSchema;
+using NHibernate.Util;
 
 namespace NHibernate.Mapping.ByCode.Impl
 {
@@ -35,8 +36,8 @@ protected void AddProperty(object property)
 			{
 				throw new ArgumentNullException("property");
 			}
-			var toAdd = new[] { property };
-			component.Items = component.Items == null ? toAdd : component.Items.Concat(toAdd).ToArray();
+
+			component.Items = ArrayHelper.Append(component.Items, property);
 		}
 
 		public void Property(MemberInfo property, Action<IPropertyMapper> mapping)
@@ -168,4 +169,4 @@ public void Unique(bool unique)
 			component.unique = unique;
 		}
 	}
-}
+}
diff --git a/src/NHibernate/Mapping/ByCode/Impl/JoinMapper.cs b/src/NHibernate/Mapping/ByCode/Impl/JoinMapper.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Linq;
 using NHibernate.Cfg.MappingSchema;
+using NHibernate.Util;
 
 namespace NHibernate.Mapping.ByCode.Impl
 {
@@ -61,8 +62,7 @@ protected override void AddProperty(object property)
 			{
 				throw new ArgumentNullException("property");
 			}
-			var toAdd = new[] { property };
-			hbmJoin.Items = hbmJoin.Items == null ? toAdd : hbmJoin.Items.Concat(toAdd).ToArray();
+			hbmJoin.Items = ArrayHelper.Append(hbmJoin.Items, property);
 		}
 
 		public void Loader(string namedQueryReference)
@@ -156,4 +156,4 @@ public void Fetch(FetchKind fetchMode)
 			hbmJoin.fetch = fetchMode.ToHbmJoinFetch();
 		}
 	}
-}
+}
diff --git a/src/NHibernate/Mapping/ByCode/Impl/JoinedSubclassMapper.cs b/src/NHibernate/Mapping/ByCode/Impl/JoinedSubclassMapper.cs
@@ -3,6 +3,7 @@
 using System.Linq;
 using NHibernate.Cfg.MappingSchema;
 using NHibernate.Persister.Entity;
+using NHibernate.Util;
 
 namespace NHibernate.Mapping.ByCode.Impl
 {
@@ -13,15 +14,14 @@ public class JoinedSubclassMapper : AbstractPropertyContainerMapper, IJoinedSubc
 
 		public JoinedSubclassMapper(System.Type subClass, HbmMapping mapDoc) : base(subClass, mapDoc)
 		{
-			var toAdd = new[] {classMapping};
 			classMapping.name = subClass.GetShortClassName(mapDoc);
 			classMapping.extends = subClass.BaseType.GetShortClassName(mapDoc);
 			if (classMapping.key == null)
 			{
 				classMapping.key = new HbmKey {column1 = subClass.BaseType.Name.ToLowerInvariant() + "_key"};
 			}
 			keyMapper = new KeyMapper(subClass, classMapping.key);
-			mapDoc.Items = mapDoc.Items == null ? toAdd : mapDoc.Items.Concat(toAdd).ToArray();
+			mapDoc.Items = ArrayHelper.Append(mapDoc.Items, classMapping);
 		}
 
 		#region Overrides of AbstractPropertyContainerMapper
@@ -32,8 +32,7 @@ protected override void AddProperty(object property)
 			{
 				throw new ArgumentNullException("property");
 			}
-			var toAdd = new[] {property};
-			classMapping.Items = classMapping.Items == null ? toAdd : classMapping.Items.Concat(toAdd).ToArray();
+			classMapping.Items = ArrayHelper.Append(classMapping.Items, property);
 		}
 
 		#endregion
@@ -214,4 +213,4 @@ public void Filter(string filterName, Action<IFilterMapper> filterMapping)
 		}
 		#endregion
 	}
-}
+}
diff --git a/src/NHibernate/Mapping/ByCode/Impl/NaturalIdMapper.cs b/src/NHibernate/Mapping/ByCode/Impl/NaturalIdMapper.cs
@@ -1,6 +1,6 @@
 using System;
-using System.Linq;
 using NHibernate.Cfg.MappingSchema;
+using NHibernate.Util;
 
 namespace NHibernate.Mapping.ByCode.Impl
 {
@@ -31,8 +31,8 @@ protected override void AddProperty(object property)
 			{
 				classMapping.naturalid = naturalIdmapping;
 			}
-			var toAdd = new[] {property};
-			naturalIdmapping.Items = naturalIdmapping.Items == null ? toAdd : naturalIdmapping.Items.Concat(toAdd).ToArray();
+
+			naturalIdmapping.Items = ArrayHelper.Append(naturalIdmapping.Items, property);
 		}
 
 		#endregion
@@ -46,4 +46,4 @@ public void Mutable(bool isMutable)
 
 		#endregion
 	}
-}
+}
diff --git a/src/NHibernate/Mapping/ByCode/Impl/SubclassMapper.cs b/src/NHibernate/Mapping/ByCode/Impl/SubclassMapper.cs
@@ -3,6 +3,7 @@
 using System.Linq;
 using NHibernate.Cfg.MappingSchema;
 using NHibernate.Persister.Entity;
+using NHibernate.Util;
 
 namespace NHibernate.Mapping.ByCode.Impl
 {
@@ -13,10 +14,9 @@ public class SubclassMapper : AbstractPropertyContainerMapper, ISubclassMapper
 
 		public SubclassMapper(System.Type subClass, HbmMapping mapDoc) : base(subClass, mapDoc)
 		{
-			var toAdd = new[] {classMapping};
 			classMapping.name = subClass.GetShortClassName(mapDoc);
 			classMapping.extends = subClass.BaseType.GetShortClassName(mapDoc);
-			mapDoc.Items = mapDoc.Items == null ? toAdd : mapDoc.Items.Concat(toAdd).ToArray();
+			mapDoc.Items = ArrayHelper.Append(mapDoc.Items, classMapping);
 		}
 
 		#region Overrides of AbstractPropertyContainerMapper
@@ -27,8 +27,8 @@ protected override void AddProperty(object property)
 			{
 				throw new ArgumentNullException("property");
 			}
-			var toAdd = new[] {property};
-			classMapping.Items = classMapping.Items == null ? toAdd : classMapping.Items.Concat(toAdd).ToArray();
+
+			classMapping.Items = ArrayHelper.Append(classMapping.Items, property);
 		}
 
 		#endregion
@@ -76,9 +76,8 @@ public void Join(string splitGroupId, Action<IJoinMapper> splitMapping)
 			{
 				var hbmJoin = new HbmJoin();
 				splitGroup = new JoinMapper(Container, splitGroupId, hbmJoin, MapDoc);
-				var toAdd = new[] { hbmJoin };
 				JoinMappers.Add(splitGroupId, splitGroup);
-				classMapping.join = classMapping.join == null ? toAdd : classMapping.join.Concat(toAdd).ToArray();
+				classMapping.join = ArrayHelper.Append(classMapping.join, hbmJoin);
 			}
 
 			splitMapping(splitGroup);
@@ -202,4 +201,4 @@ public void Filter(string filterName, Action<IFilterMapper> filterMapping)
 		}
 		#endregion
 	}
-}
+}
diff --git a/src/NHibernate/Mapping/ByCode/Impl/UnionSubclassMapper.cs b/src/NHibernate/Mapping/ByCode/Impl/UnionSubclassMapper.cs
@@ -3,6 +3,7 @@
 using System.Linq;
 using NHibernate.Cfg.MappingSchema;
 using NHibernate.Persister.Entity;
+using NHibernate.Util;
 
 namespace NHibernate.Mapping.ByCode.Impl
 {
@@ -14,15 +15,14 @@ public UnionSubclassMapper(System.Type subClass, HbmMapping mapDoc)
 			: base(subClass, mapDoc)
 		{
 			classMapping = new HbmUnionSubclass();
-			var toAdd = new[] {classMapping};
 			classMapping.name = subClass.GetShortClassName(mapDoc);
 			classMapping.extends = subClass.BaseType.GetShortClassName(mapDoc);
 			if (subClass.IsAbstract)
 			{
 				classMapping.@abstract = true;
 				classMapping.abstractSpecified = true;
 			}
-			mapDoc.Items = mapDoc.Items == null ? toAdd : mapDoc.Items.Concat(toAdd).ToArray();
+			mapDoc.Items = ArrayHelper.Append(mapDoc.Items, classMapping);
 		}
 
 		#region Overrides of AbstractPropertyContainerMapper
@@ -33,8 +33,8 @@ protected override void AddProperty(object property)
 			{
 				throw new ArgumentNullException("property");
 			}
-			var toAdd = new[] {property};
-			classMapping.Items = classMapping.Items == null ? toAdd : classMapping.Items.Concat(toAdd).ToArray();
+
+			classMapping.Items = ArrayHelper.Append(classMapping.Items, property);
 		}
 
 		#endregion
@@ -192,4 +192,4 @@ public void Extends(string entityOrClassName)
 
 		#endregion
 	}
-}
+}
diff --git a/src/NHibernate/Mapping/ByCode/Import.cs b/src/NHibernate/Mapping/ByCode/Import.cs
diff --git a/src/NHibernate/Util/ArrayHelper.cs b/src/NHibernate/Util/ArrayHelper.cs

Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,7 @@`
`4`	`4`	`using System.Reflection;`
`5`	`5`	`using NHibernate.Cfg.MappingSchema;`
`6`	`6`	`using NHibernate.Persister.Entity;`
	`7`	`+using NHibernate.Util;`
`7`	`8`
`8`	`9`	`namespace NHibernate.Mapping.ByCode.Impl`
`9`	`10`	`{`
`@@ -24,7 +25,6 @@ public ClassMapper(System.Type rootClass, HbmMapping mapDoc, MemberInfo idProper`
`24`	`25`	`: base(rootClass, mapDoc)`
`25`	`26`	`{`
`26`	`27`	`classMapping = new HbmClass();`
`27`		`- var toAdd = new[] {classMapping};`
`28`	`28`	`classMapping.name = rootClass.GetShortClassName(mapDoc);`
`29`	`29`	`if (rootClass.IsAbstract)`
`30`	`30`	`{`
`@@ -36,7 +36,7 @@ public ClassMapper(System.Type rootClass, HbmMapping mapDoc, MemberInfo idProper`
`36`	`36`	`classMapping.Item = hbmId;`
`37`	`37`	`idMapper = new IdMapper(idProperty, hbmId);`
`38`	`38`
`39`		`- mapDoc.Items = mapDoc.Items == null ? toAdd : mapDoc.Items.Concat(toAdd).ToArray();`
	`39`	`+ mapDoc.Items = ArrayHelper.Append(mapDoc.Items, classMapping);`
`40`	`40`	`}`
`41`	`41`
`42`	`42`	`#region Overrides of AbstractPropertyContainerMapper`
`@@ -47,8 +47,7 @@ protected override void AddProperty(object property)`
`47`	`47`	`{`
`48`	`48`	`throw new ArgumentNullException("property");`
`49`	`49`	`}`
`50`		`- var toAdd = new[] {property};`
`51`		`- classMapping.Items = classMapping.Items == null ? toAdd : classMapping.Items.Concat(toAdd).ToArray();`
	`50`	`+ classMapping.Items = ArrayHelper.Append(classMapping.Items, property);`
`52`	`51`	`}`
`53`	`52`
`54`	`53`	`#endregion`
`@@ -258,9 +257,8 @@ public void Join(string splitGroupId, Action<IJoinMapper> splitMapping)`
`258`	`257`	`{`
`259`	`258`	`var hbmJoin = new HbmJoin();`
`260`	`259`	`splitGroup = new JoinMapper(Container, splitGroupId, hbmJoin, MapDoc);`
`261`		`- var toAdd = new[] { hbmJoin };`
`262`	`260`	`JoinMappers.Add(splitGroupId, splitGroup);`
`263`		`- classMapping.Items1 = classMapping.Items1 == null ? toAdd : classMapping.Items1.Concat(toAdd).ToArray();`
	`261`	`+ classMapping.Items1 = ArrayHelper.Append(classMapping.Items1, hbmJoin);`
`264`	`262`	`}`
`265`	`263`
`266`	`264`	`splitMapping(splitGroup);`
`@@ -391,4 +389,4 @@ public void Subselect(string sql)`
`391`	`389`
`392`	`390`	`#endregion`
`393`	`391`	`}`
`394`		`-}`
	`392`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`using System;`
`2`		`-using System.Linq;`
`3`	`2`	`using System.Reflection;`
`4`	`3`	`using NHibernate.Cfg.MappingSchema;`
	`4`	`+using NHibernate.Util;`
`5`	`5`
`6`	`6`	`namespace NHibernate.Mapping.ByCode.Impl`
`7`	`7`	`{`
`@@ -65,8 +65,7 @@ protected void AddProperty(object property)`
`65`	`65`	`{`
`66`	`66`	`throw new ArgumentNullException("property");`
`67`	`67`	`}`
`68`		`- var toAdd = new[] { property };`
`69`		`- id.Items = id.Items == null ? toAdd : id.Items.Concat(toAdd).ToArray();`
	`68`	`+ id.Items = ArrayHelper.Append(id.Items, property);`
`70`	`69`	`}`
`71`	`70`	`}`
`72`		`-}`
	`71`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,7 @@`
`2`	`2`	`using System.Linq;`
`3`	`3`	`using System.Reflection;`
`4`	`4`	`using NHibernate.Cfg.MappingSchema;`
	`5`	`+using NHibernate.Util;`
`5`	`6`
`6`	`7`	`namespace NHibernate.Mapping.ByCode.Impl`
`7`	`8`	`{`
`@@ -32,8 +33,7 @@ protected override void AddProperty(object property)`
`32`	`33`	`{`
`33`	`34`	`throw new ArgumentNullException("property");`
`34`	`35`	`}`
`35`		`- var toAdd = new[] {property};`
`36`		`- _component.Items = _component.Items == null ? toAdd : _component.Items.Concat(toAdd).ToArray();`
	`36`	`+ _component.Items = ArrayHelper.Append(_component.Items, property);`
`37`	`37`	`}`
`38`	`38`
`39`	`39`	`#endregion`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,7 @@`
`1`	`1`	`using System;`
`2`	`2`	`using System.Linq;`
`3`	`3`	`using NHibernate.Cfg.MappingSchema;`
	`4`	`+using NHibernate.Util;`
`4`	`5`
`5`	`6`	`namespace NHibernate.Mapping.ByCode.Impl`
`6`	`7`	`{`
`@@ -61,8 +62,7 @@ protected override void AddProperty(object property)`
`61`	`62`	`{`
`62`	`63`	`throw new ArgumentNullException("property");`
`63`	`64`	`}`
`64`		`- var toAdd = new[] { property };`
`65`		`- hbmJoin.Items = hbmJoin.Items == null ? toAdd : hbmJoin.Items.Concat(toAdd).ToArray();`
	`65`	`+ hbmJoin.Items = ArrayHelper.Append(hbmJoin.Items, property);`
`66`	`66`	`}`
`67`	`67`
`68`	`68`	`public void Loader(string namedQueryReference)`
`@@ -156,4 +156,4 @@ public void Fetch(FetchKind fetchMode)`
`156`	`156`	`hbmJoin.fetch = fetchMode.ToHbmJoinFetch();`
`157`	`157`	`}`
`158`	`158`	`}`
`159`		`-}`
	`159`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,7 @@`
`3`	`3`	`using System.Linq;`
`4`	`4`	`using NHibernate.Cfg.MappingSchema;`
`5`	`5`	`using NHibernate.Persister.Entity;`
	`6`	`+using NHibernate.Util;`
`6`	`7`
`7`	`8`	`namespace NHibernate.Mapping.ByCode.Impl`
`8`	`9`	`{`
`@@ -13,15 +14,14 @@ public class JoinedSubclassMapper : AbstractPropertyContainerMapper, IJoinedSubc`
`13`	`14`
`14`	`15`	`public JoinedSubclassMapper(System.Type subClass, HbmMapping mapDoc) : base(subClass, mapDoc)`
`15`	`16`	`{`
`16`		`- var toAdd = new[] {classMapping};`
`17`	`17`	`classMapping.name = subClass.GetShortClassName(mapDoc);`
`18`	`18`	`classMapping.extends = subClass.BaseType.GetShortClassName(mapDoc);`
`19`	`19`	`if (classMapping.key == null)`
`20`	`20`	`{`
`21`	`21`	`classMapping.key = new HbmKey {column1 = subClass.BaseType.Name.ToLowerInvariant() + "_key"};`
`22`	`22`	`}`
`23`	`23`	`keyMapper = new KeyMapper(subClass, classMapping.key);`
`24`		`- mapDoc.Items = mapDoc.Items == null ? toAdd : mapDoc.Items.Concat(toAdd).ToArray();`
	`24`	`+ mapDoc.Items = ArrayHelper.Append(mapDoc.Items, classMapping);`
`25`	`25`	`}`
`26`	`26`
`27`	`27`	`#region Overrides of AbstractPropertyContainerMapper`
`@@ -32,8 +32,7 @@ protected override void AddProperty(object property)`
`32`	`32`	`{`
`33`	`33`	`throw new ArgumentNullException("property");`
`34`	`34`	`}`
`35`		`- var toAdd = new[] {property};`
`36`		`- classMapping.Items = classMapping.Items == null ? toAdd : classMapping.Items.Concat(toAdd).ToArray();`
	`35`	`+ classMapping.Items = ArrayHelper.Append(classMapping.Items, property);`
`37`	`36`	`}`
`38`	`37`
`39`	`38`	`#endregion`
`@@ -214,4 +213,4 @@ public void Filter(string filterName, Action<IFilterMapper> filterMapping)`
`214`	`213`	`}`
`215`	`214`	`#endregion`
`216`	`215`	`}`
`217`		`-}`
	`216`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`using System;`
`2`		`-using System.Linq;`
`3`	`2`	`using NHibernate.Cfg.MappingSchema;`
	`3`	`+using NHibernate.Util;`
`4`	`4`
`5`	`5`	`namespace NHibernate.Mapping.ByCode.Impl`
`6`	`6`	`{`
`@@ -31,8 +31,8 @@ protected override void AddProperty(object property)`
`31`	`31`	`{`
`32`	`32`	`classMapping.naturalid = naturalIdmapping;`
`33`	`33`	`}`
`34`		`- var toAdd = new[] {property};`
`35`		`- naturalIdmapping.Items = naturalIdmapping.Items == null ? toAdd : naturalIdmapping.Items.Concat(toAdd).ToArray();`
	`34`	`+`
	`35`	`+ naturalIdmapping.Items = ArrayHelper.Append(naturalIdmapping.Items, property);`
`36`	`36`	`}`
`37`	`37`
`38`	`38`	`#endregion`
`@@ -46,4 +46,4 @@ public void Mutable(bool isMutable)`
`46`	`46`
`47`	`47`	`#endregion`
`48`	`48`	`}`
`49`		`-}`
	`49`	`+}`