From 75d7f4f35b99719d14ccf841071911a463fcbc20 Mon Sep 17 00:00:00 2001 From: Roman Artiukhin Date: Mon, 24 Jul 2023 18:59:50 +0300 Subject: [PATCH 1/2] Fix BeforeAssemble call for Map and IdentifierBag --- .../Collection/Generic/PersistentGenericIdentifierBag.cs | 2 +- src/NHibernate/Collection/Generic/PersistentGenericMap.cs | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/NHibernate/Collection/Generic/PersistentGenericIdentifierBag.cs b/src/NHibernate/Collection/Generic/PersistentGenericIdentifierBag.cs index 71005049ad8..59769257121 100644 --- 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 index e81aee07578..24c4c30568e 100644 --- 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); From 95dc9e4a27fcc05f0ea424dbb957357c9382af19 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Mon, 24 Jul 2023 16:04:20 +0000 Subject: [PATCH 2/2] Generate async files --- .../Collection/Generic/PersistentGenericIdentifierBag.cs | 2 +- .../Async/Collection/Generic/PersistentGenericMap.cs | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/NHibernate/Async/Collection/Generic/PersistentGenericIdentifierBag.cs b/src/NHibernate/Async/Collection/Generic/PersistentGenericIdentifierBag.cs index af37fb8a1e0..1b8a8f57502 100644 --- 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 index fbe6e30c490..3348087744a 100644 --- 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);