Fix BeforeAssemble call for Map and IdentifierBag (nhibernate#3380)

Fixup for nhibernate#3365
fredericDelaporte · Jul 25, 2023 · c9d0a95 · c9d0a95
1 parent 13565fb
commit c9d0a95
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/src/NHibernate/Async/Collection/Generic/PersistentGenericIdentifierBag.cs b/src/NHibernate/Async/Collection/Generic/PersistentGenericIdentifierBag.cs
@@ -47,7 +47,7 @@ public override async Task InitializeFromCacheAsync(ICollectionPersister persist
 
 			var identifierType = persister.IdentifierType;
 			var elementType = persister.ElementType;
-			for (int i = 0; i < size; i++)
+			for (int i = 0; i < size; i += 2)
 			{
 				await (identifierType.BeforeAssembleAsync(array[i], Session, cancellationToken)).ConfigureAwait(false);
 				await (elementType.BeforeAssembleAsync(array[i + 1], Session, cancellationToken)).ConfigureAwait(false);

diff --git a/src/NHibernate/Async/Collection/Generic/PersistentGenericMap.cs b/src/NHibernate/Async/Collection/Generic/PersistentGenericMap.cs
@@ -94,10 +94,10 @@ public override async Task InitializeFromCacheAsync(ICollectionPersister persist
 			object[] array = (object[])disassembled;
 			int size = array.Length;
 			BeforeInitialize(persister, size);
-			
+
 			var indexType = persister.IndexType;
 			var elementType = persister.ElementType;
-			for (int i = 0; i < size; i++)
+			for (int i = 0; i < size; i += 2)
 			{
 				await (indexType.BeforeAssembleAsync(array[i], Session, cancellationToken)).ConfigureAwait(false);
 				await (elementType.BeforeAssembleAsync(array[i + 1], Session, cancellationToken)).ConfigureAwait(false);

diff --git a/src/NHibernate/Collection/Generic/PersistentGenericIdentifierBag.cs b/src/NHibernate/Collection/Generic/PersistentGenericIdentifierBag.cs
@@ -78,7 +78,7 @@ public override void InitializeFromCache(ICollectionPersister persister, object
 
 			var identifierType = persister.IdentifierType;
 			var elementType = persister.ElementType;
-			for (int i = 0; i < size; i++)
+			for (int i = 0; i < size; i += 2)
 			{
 				identifierType.BeforeAssemble(array[i], Session);
 				elementType.BeforeAssemble(array[i + 1], Session);

diff --git a/src/NHibernate/Collection/Generic/PersistentGenericMap.cs b/src/NHibernate/Collection/Generic/PersistentGenericMap.cs
@@ -163,10 +163,10 @@ public override void InitializeFromCache(ICollectionPersister persister, object
 			object[] array = (object[])disassembled;
 			int size = array.Length;
 			BeforeInitialize(persister, size);
-			
+
 			var indexType = persister.IndexType;
 			var elementType = persister.ElementType;
-			for (int i = 0; i < size; i++)
+			for (int i = 0; i < size; i += 2)
 			{
 				indexType.BeforeAssemble(array[i], Session);
 				elementType.BeforeAssemble(array[i + 1], Session);