Skip to content

Commit 08c6a3f

Browse files
Fix collection cache lookup failure with enum keys
fix #3643
1 parent 3b29f38 commit 08c6a3f

File tree

2 files changed

+3
-1
lines changed

2 files changed

+3
-1
lines changed

src/NHibernate/Async/Type/TypeHelper.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -125,6 +125,7 @@ internal static async Task InitializeCollectionsAsync(
125125
continue;
126126
}
127127

128+
value = await (pair.Value.KeyType.AssembleAsync(value, session, null, cancellationToken)).ConfigureAwait(false);
128129
var collection = session.PersistenceContext.GetCollection(new CollectionKey(pair.Value, value));
129130
await (collection.ForceInitializationAsync(cancellationToken)).ConfigureAwait(false);
130131
assembleRow[pair.Key] = collection;

src/NHibernate/Type/TypeHelper.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
using System;
1+
using System;
22
using System.Collections;
33
using System.Collections.Generic;
44
using NHibernate.Collection;
@@ -133,6 +133,7 @@ internal static void InitializeCollections(
133133
continue;
134134
}
135135

136+
value = pair.Value.KeyType.Assemble(value, session, null);
136137
var collection = session.PersistenceContext.GetCollection(new CollectionKey(pair.Value, value));
137138
collection.ForceInitialization();
138139
assembleRow[pair.Key] = collection;

0 commit comments

Comments
 (0)