Skip to content

Commit c9d0a95

Browse files
authored
Fix BeforeAssemble call for Map and IdentifierBag (nhibernate#3380)
Fixup for nhibernate#3365
1 parent 13565fb commit c9d0a95

File tree

4 files changed

+6
-6
lines changed

4 files changed

+6
-6
lines changed

src/NHibernate/Async/Collection/Generic/PersistentGenericIdentifierBag.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ public override async Task InitializeFromCacheAsync(ICollectionPersister persist
4747

4848
var identifierType = persister.IdentifierType;
4949
var elementType = persister.ElementType;
50-
for (int i = 0; i < size; i++)
50+
for (int i = 0; i < size; i += 2)
5151
{
5252
await (identifierType.BeforeAssembleAsync(array[i], Session, cancellationToken)).ConfigureAwait(false);
5353
await (elementType.BeforeAssembleAsync(array[i + 1], Session, cancellationToken)).ConfigureAwait(false);

src/NHibernate/Async/Collection/Generic/PersistentGenericMap.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -94,10 +94,10 @@ public override async Task InitializeFromCacheAsync(ICollectionPersister persist
9494
object[] array = (object[])disassembled;
9595
int size = array.Length;
9696
BeforeInitialize(persister, size);
97-
97+
9898
var indexType = persister.IndexType;
9999
var elementType = persister.ElementType;
100-
for (int i = 0; i < size; i++)
100+
for (int i = 0; i < size; i += 2)
101101
{
102102
await (indexType.BeforeAssembleAsync(array[i], Session, cancellationToken)).ConfigureAwait(false);
103103
await (elementType.BeforeAssembleAsync(array[i + 1], Session, cancellationToken)).ConfigureAwait(false);

src/NHibernate/Collection/Generic/PersistentGenericIdentifierBag.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ public override void InitializeFromCache(ICollectionPersister persister, object
7878

7979
var identifierType = persister.IdentifierType;
8080
var elementType = persister.ElementType;
81-
for (int i = 0; i < size; i++)
81+
for (int i = 0; i < size; i += 2)
8282
{
8383
identifierType.BeforeAssemble(array[i], Session);
8484
elementType.BeforeAssemble(array[i + 1], Session);

src/NHibernate/Collection/Generic/PersistentGenericMap.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -163,10 +163,10 @@ public override void InitializeFromCache(ICollectionPersister persister, object
163163
object[] array = (object[])disassembled;
164164
int size = array.Length;
165165
BeforeInitialize(persister, size);
166-
166+
167167
var indexType = persister.IndexType;
168168
var elementType = persister.ElementType;
169-
for (int i = 0; i < size; i++)
169+
for (int i = 0; i < size; i += 2)
170170
{
171171
indexType.BeforeAssemble(array[i], Session);
172172
elementType.BeforeAssemble(array[i + 1], Session);

0 commit comments

Comments
 (0)