XmlHbmBinding/ResultSetMappingBinder.cs: Comment out a piece of code that I believe would always cause exception, to get rid of call to ArrayHelper.AddAll() (preparing to add an overload that would be ambiguous).

Criterion/Junction.cs, Criterion/ProjectionList.cs: Remove needless use of ArrayHelper.AddAll().

Author: oskarb

src/NHibernate/Cfg/XmlHbmBinding/ResultSetMappingBinder.cs

@@ -292,7 +292,15 @@ private IDictionary<string, string[]> BindPropertyResults(string alias, HbmRetur
 				if (!propertyresults.TryGetValue(key,out intermediateResults))
 					propertyresults[key] = allResultColumns.ToArray();
 				else
-					ArrayHelper.AddAll(intermediateResults, allResultColumns); // TODO: intermediateResults not used after this
+				{
+					throw new NotImplementedException();
+					// 2013-02-24: In 89994bc113e1bb35bf6bcd0b7408d08340bfbccd, 2008-05-29, the intermediateResults
+					// variable was changed from ArrayList to string[]. The following code line was there before.
+					// Since an array cannot be modified, it seems this code line has never been hit since then.
+					// While working on NH-3345, I'm adding an ambigous overload for AddAll(), and I don't want to
+					// try to understand this code right now, so comment it out instead. /Oskar
+					//ArrayHelper.AddAll(intermediateResults, allResultColumns); // TODO: intermediateResults not used after this
+				}
 			}
 
 			Dictionary<string, string[]> newPropertyResults = new Dictionary<string, string[]>();

src/NHibernate/Criterion/Junction.cs

@@ -66,7 +66,7 @@ public override TypedValue[] GetTypedValues(ICriteria criteria, ICriteriaQuery c
 			foreach (ICriterion criterion in this.criteria)
 			{
 				TypedValue[] subvalues = criterion.GetTypedValues(criteria, criteriaQuery);
-				ArrayHelper.AddAll(typedValues, subvalues);
+				typedValues.AddRange(subvalues);
 			}
 
 			return typedValues.ToArray();

src/NHibernate/Criterion/ProjectionList.cs

@@ -120,11 +120,11 @@ public string[] GetColumnAliases(string alias, int loc)
 
 		public string[] GetColumnAliases(int position, ICriteria criteria, ICriteriaQuery criteriaQuery)
 		{
-			var result = new List<object>(Length);
+			var result = new List<string>(Length);
 			for (var i = 0; i < Length; i++)
 			{
 				var colAliases = GetColumnAliases(position, criteria, criteriaQuery, this[i]);
-				ArrayHelper.AddAll(result, colAliases);
+				result.AddRange(colAliases);
 				position += colAliases.Length;
 			}
 			return ArrayHelper.ToStringArray(result);