fixup! Resolve collection owner correctly in case of property-ref

Handle possibly null case

Co-Authored-By: Alexander Zaytsev <hazzik@gmail.com>

Author: fredericDelaporte

src/NHibernate/Async/Loader/Loader.cs

@@ -652,7 +652,35 @@ private async Task<object[]> GetRowAsync(DbDataReader rs, ILoadable[] persisters
 						// been cached too for all its unique keys, provided its persister implement it. With this new
 						// way of caching unique keys, it is no more needed to handle caching for alreadyLoaded path
 						// too.
-						await ((persister as IUniqueKeyLoadable).CacheByUniqueKeysAsync(obj, session, cancellationToken)).ConfigureAwait(false);
+						var cacheByUniqueKeysTask = (persister as IUniqueKeyLoadable)?.CacheByUniqueKeysAsync(obj, session, cancellationToken);
+
+						// IUniqueKeyLoadable.CacheByUniqueKeys caches all unique keys of the entity, regardless of
+						// associations loaded by the query. So if the entity is already loaded, it has forcibly already
+						// been cached too for all its unique keys, provided its persister implement it. With this new
+						// way of caching unique keys, it is no more needed to handle caching for alreadyLoaded path
+						// too.
+						if (cacheByUniqueKeysTask != null)
+
+						// IUniqueKeyLoadable.CacheByUniqueKeys caches all unique keys of the entity, regardless of
+						// associations loaded by the query. So if the entity is already loaded, it has forcibly already
+						// been cached too for all its unique keys, provided its persister implement it. With this new
+						// way of caching unique keys, it is no more needed to handle caching for alreadyLoaded path
+						// too.
+						{
+
+							// IUniqueKeyLoadable.CacheByUniqueKeys caches all unique keys of the entity, regardless of
+							// associations loaded by the query. So if the entity is already loaded, it has forcibly already
+							// been cached too for all its unique keys, provided its persister implement it. With this new
+							// way of caching unique keys, it is no more needed to handle caching for alreadyLoaded path
+							// too.
+							await (cacheByUniqueKeysTask).ConfigureAwait(false);
+
+						// IUniqueKeyLoadable.CacheByUniqueKeys caches all unique keys of the entity, regardless of
+						// associations loaded by the query. So if the entity is already loaded, it has forcibly already
+						// been cached too for all its unique keys, provided its persister implement it. With this new
+						// way of caching unique keys, it is no more needed to handle caching for alreadyLoaded path
+						// too.
+						}
 					}
 					// 6.0 TODO: this call is nor more needed for up-to-date persisters, remove once CacheByUniqueKeys
 					// is merged in IUniqueKeyLoadable interface instead of being an extension method

src/NHibernate/Loader/Loader.cs

@@ -987,7 +987,7 @@ private object[] GetRow(DbDataReader rs, ILoadable[] persisters, EntityKey[] key
 						// been cached too for all its unique keys, provided its persister implement it. With this new
 						// way of caching unique keys, it is no more needed to handle caching for alreadyLoaded path
 						// too.
-						(persister as IUniqueKeyLoadable).CacheByUniqueKeys(obj, session);
+						(persister as IUniqueKeyLoadable)?.CacheByUniqueKeys(obj, session);
 					}
 					// 6.0 TODO: this call is nor more needed for up-to-date persisters, remove once CacheByUniqueKeys
 					// is merged in IUniqueKeyLoadable interface instead of being an extension method