Better async key processing

Author: bahusoid

src/NHibernate/Async/Engine/BatchFetchQueue.cs

@@ -74,7 +74,7 @@ internal async Task<object[]> GetCollectionBatchAsync(ICollectionPersister colle
 			foreach (KeyValuePair<CollectionEntry, IPersistentCollection> me in map)
 			{
 				cancellationToken.ThrowIfCancellationRequested();
-				if (await (ProcessKeyAndCheckCacheAsync(me)).ConfigureAwait(false))
+				if (ProcessKey(me) ?? await (CheckCacheAndProcessResultAsync()).ConfigureAwait(false))
 				{
 					return keys;
 				}
@@ -132,11 +132,6 @@ async Task<bool> CheckCacheAndProcessResultAsync()
 				return false;
 			}
 
-			async Task<bool> ProcessKeyAndCheckCacheAsync(KeyValuePair<CollectionEntry, IPersistentCollection> me)
-			{
-				return ProcessKey(me) ?? await (CheckCacheAndProcessResultAsync()).ConfigureAwait(false);
-			}
-
 			bool? ProcessKey(KeyValuePair<CollectionEntry, IPersistentCollection> me, bool ignoreCache = false)
 			{
 				var ce = me.Key;

src/NHibernate/Engine/BatchFetchQueue.cs

@@ -244,7 +244,7 @@ internal object[] GetCollectionBatch(ICollectionPersister collectionPersister, o
 
 			foreach (KeyValuePair<CollectionEntry, IPersistentCollection> me in map)
 			{
-				if (ProcessKeyAndCheckCache(me))
+				if (ProcessKey(me) ?? CheckCacheAndProcessResult())
 				{
 					return keys;
 				}
@@ -301,11 +301,6 @@ bool CheckCacheAndProcessResult()
 				return false;
 			}
 
-			bool ProcessKeyAndCheckCache(KeyValuePair<CollectionEntry, IPersistentCollection> me)
-			{
-				return ProcessKey(me) ?? CheckCacheAndProcessResult();
-			}
-
 			bool? ProcessKey(KeyValuePair<CollectionEntry, IPersistentCollection> me, bool ignoreCache = false)
 			{
 				var ce = me.Key;