Skip to content

Commit 81c1b18

Browse files
Generate async files
1 parent 8228b04 commit 81c1b18

File tree

1 file changed

+10
-13
lines changed

1 file changed

+10
-13
lines changed

src/NHibernate/Async/Cache/StandardQueryCache.cs

Lines changed: 10 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -37,24 +37,21 @@ public Task ClearAsync(CancellationToken cancellationToken)
3737
}
3838

3939
/// <inheritdoc />
40-
public async Task<bool> PutAsync(
40+
public Task<bool> PutAsync(
4141
QueryKey key,
4242
QueryParameters queryParameters,
4343
ICacheAssembler[] returnTypes,
4444
IList result,
4545
ISessionImplementor session, CancellationToken cancellationToken)
4646
{
47-
cancellationToken.ThrowIfCancellationRequested();
48-
if (queryParameters.NaturalKeyLookup && result.Count == 0)
49-
return false;
50-
51-
var ts = session.Factory.Settings.CacheProvider.NextTimestamp();
52-
53-
Log.Debug("caching query results in region: '{0}'; {1}", _regionName, key);
54-
55-
await (Cache.PutAsync(key, await (GetCacheableResultAsync(returnTypes, session, result, ts, GetAutoDiscoveredAliases(key), cancellationToken)).ConfigureAwait(false), cancellationToken)).ConfigureAwait(false);
56-
57-
return true;
47+
if (cancellationToken.IsCancellationRequested)
48+
{
49+
return Task.FromCanceled<bool>(cancellationToken);
50+
}
51+
// 6.0 TODO: inline the call.
52+
#pragma warning disable 612
53+
return PutAsync(key, returnTypes, result, queryParameters.NaturalKeyLookup, session, cancellationToken);
54+
#pragma warning restore 612
5855
}
5956

6057
// Since 5.2
@@ -69,7 +66,7 @@ public async Task<bool> PutAsync(QueryKey key, ICacheAssembler[] returnTypes, IL
6966

7067
Log.Debug("caching query results in region: '{0}'; {1}", _regionName, key);
7168

72-
await (Cache.PutAsync(key, await (GetCacheableResultAsync(returnTypes, session, result, ts, null, cancellationToken)).ConfigureAwait(false), cancellationToken)).ConfigureAwait(false);
69+
await (Cache.PutAsync(key, await (GetCacheableResultAsync(returnTypes, session, result, ts, GetAutoDiscoveredAliases(key), cancellationToken)).ConfigureAwait(false), cancellationToken)).ConfigureAwait(false);
7370

7471
return true;
7572
}

0 commit comments

Comments
 (0)