@@ -37,24 +37,21 @@ public Task ClearAsync(CancellationToken cancellationToken)
37
37
}
38
38
39
39
/// <inheritdoc />
40
- public async Task < bool > PutAsync (
40
+ public Task < bool > PutAsync (
41
41
QueryKey key ,
42
42
QueryParameters queryParameters ,
43
43
ICacheAssembler [ ] returnTypes ,
44
44
IList result ,
45
45
ISessionImplementor session , CancellationToken cancellationToken )
46
46
{
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
58
55
}
59
56
60
57
// Since 5.2
@@ -69,7 +66,7 @@ public async Task<bool> PutAsync(QueryKey key, ICacheAssembler[] returnTypes, IL
69
66
70
67
Log . Debug ( "caching query results in region: '{0}'; {1}" , _regionName , key ) ;
71
68
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 ) ;
73
70
74
71
return true ;
75
72
}
0 commit comments