AbstractCollectionPersister.cs: Avoid use of Reset() on enumerator - it is usually not expected to be implemented.

Author: oskarb

src/NHibernate/Persister/Collection/AbstractCollectionPersister.cs

@@ -2,8 +2,8 @@
 using System.Collections;
 using System.Collections.Generic;
 using System.Data;
-using System.Data.Common;
-using System.Linq;
+using System.Data.Common;
+using System.Linq;
 using System.Text;
 using NHibernate.AdoNet;
 using NHibernate.Cache;
@@ -621,11 +621,11 @@ private ICollectionInitializer GetSubselectInitializer(object key, ISessionImple
 			else
 			{
 				// Take care of any entities that might have
-				// been evicted!
-				List<EntityKey> keysToRemove = subselect.Result
-					.Where(entityKey => !persistenceContext.ContainsEntity(entityKey)).ToList();
-
-				foreach (var entityKey in keysToRemove)
+				// been evicted!
+				List<EntityKey> keysToRemove = subselect.Result
+					.Where(entityKey => !persistenceContext.ContainsEntity(entityKey)).ToList();
+
+				foreach (var entityKey in keysToRemove)
 					subselect.Result.Remove(entityKey);
 
 				// Run a subquery loader
@@ -1080,50 +1080,49 @@ public void Recreate(IPersistentCollection collection, object id, ISessionImplem
 
 				try
 				{
+					IExpectation expectation = null;
+					bool useBatch = false;
+					int i = 0;
+					int count = 0;
+
 					// create all the new entries
 					IEnumerator entries = collection.Entries(this).GetEnumerator();
-					if (entries.MoveNext())
+					while (entries.MoveNext())
 					{
-						entries.Reset();
-						IExpectation expectation = Expectations.AppropriateExpectation(insertCheckStyle);
-						collection.PreInsert(this);
-						//bool callable = InsertCallable;
-						bool useBatch = expectation.CanBeBatched;
-						int i = 0;
-						int count = 0;
-
-						while (entries.MoveNext())
+						// Init, if we're on the first element.
+						if (count == 0)
 						{
-							object entry = entries.Current;
-							if (collection.EntryExists(entry, i))
-							{
-								object entryId;
-								if (!IsIdentifierAssignedByInsert)
-								{
-									// NH Different implementation: write once
-									entryId = PerformInsert(id, collection, expectation, entry, i, useBatch, false, session);
-								}
-								else
-								{
-									entryId = PerformInsert(id, collection, entry, i, session);
-								}
-								collection.AfterRowInsert(this, entry, i, entryId);
-								count++;
-							}
-							i++;
+							expectation = Expectations.AppropriateExpectation(insertCheckStyle);
+							collection.PreInsert(this);
+							//bool callable = InsertCallable;
+							useBatch = expectation.CanBeBatched;
 						}
 
-						if (log.IsDebugEnabled)
+						object entry = entries.Current;
+						if (collection.EntryExists(entry, i))
 						{
-							log.Debug(string.Format("done inserting collection: {0} rows inserted", count));
+							object entryId;
+							if (!IsIdentifierAssignedByInsert)
+							{
+								// NH Different implementation: write once
+								entryId = PerformInsert(id, collection, expectation, entry, i, useBatch, false, session);
+							}
+							else
+							{
+								entryId = PerformInsert(id, collection, entry, i, session);
+							}
+							collection.AfterRowInsert(this, entry, i, entryId);
+							count++;
 						}
+						i++;
 					}
-					else
+
+					if (log.IsDebugEnabled)
 					{
-						if (log.IsDebugEnabled)
-						{
+						if (count > 0)
+							log.Debug(string.Format("done inserting collection: {0} rows inserted", count));
+						else
 							log.Debug("collection was empty");
-						}
 					}
 				}
 				catch (DbException sqle)