Skip to content

Commit 54b5011

Browse files
bahusoidbahusoid
committed
Separate second level cache per tenant
1 parent 9575f61 commit 54b5011

File tree

65 files changed

+863
-625
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

65 files changed

+863
-625
lines changed

‎src/NHibernate.Test/Async/CacheTest/BatchableCacheFixture.cs

Lines changed: 22 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@
1616
using NHibernate.Cfg;
1717
using NHibernate.Linq;
1818
using NHibernate.Multi;
19+
using NHibernate.Persister.Collection;
20+
using NHibernate.Persister.Entity;
1921
using NHibernate.Test.CacheTest.Caches;
2022
using NUnit.Framework;
2123
using Environment = NHibernate.Cfg.Environment;
@@ -108,8 +110,8 @@ protected override void OnTearDown()
108110
public async Task MultipleGetReadOnlyCollectionTestAsync()
109111
{
110112
var persister = Sfi.GetCollectionPersister($"{typeof(ReadOnly).FullName}.Items");
111-
Assert.That(persister.Cache.Cache, Is.Not.Null);
112-
Assert.That(persister.Cache.Cache, Is.TypeOf<BatchableCache>());
113+
Assert.That(persister.GetCache(null).Cache, Is.Not.Null);
114+
Assert.That(persister.GetCache(null).Cache, Is.TypeOf<BatchableCache>());
113115
var ids = new List<int>();
114116

115117
using (var s = Sfi.OpenSession())
@@ -218,8 +220,8 @@ public async Task MultipleGetReadOnlyCollectionTestAsync()
218220
public async Task MultipleGetReadOnlyTestAsync()
219221
{
220222
var persister = Sfi.GetEntityPersister(typeof(ReadOnly).FullName);
221-
Assert.That(persister.Cache.Cache, Is.Not.Null);
222-
Assert.That(persister.Cache.Cache, Is.TypeOf<BatchableCache>());
223+
Assert.That(persister.GetCache(null).Cache, Is.Not.Null);
224+
Assert.That(persister.GetCache(null).Cache, Is.TypeOf<BatchableCache>());
223225
int[] getIds;
224226
int[] loadIds;
225227

@@ -380,8 +382,8 @@ public async Task MultipleGetReadOnlyTestAsync()
380382
public async Task MultipleGetReadOnlyItemTestAsync()
381383
{
382384
var persister = Sfi.GetEntityPersister(typeof(ReadOnlyItem).FullName);
383-
Assert.That(persister.Cache.Cache, Is.Not.Null);
384-
Assert.That(persister.Cache.Cache, Is.TypeOf<BatchableCache>());
385+
Assert.That(persister.GetCache(null).Cache, Is.Not.Null);
386+
Assert.That(persister.GetCache(null).Cache, Is.TypeOf<BatchableCache>());
385387
int[] getIds;
386388
int[] loadIds;
387389

@@ -542,9 +544,9 @@ public async Task MultipleGetReadOnlyItemTestAsync()
542544
public async Task MultiplePutReadWriteTestAsync()
543545
{
544546
var persister = Sfi.GetEntityPersister(typeof(ReadWrite).FullName);
545-
Assert.That(persister.Cache.Cache, Is.Not.Null);
546-
Assert.That(persister.Cache.Cache, Is.TypeOf<BatchableCache>());
547-
var cache = (BatchableCache) persister.Cache.Cache;
547+
Assert.That(persister.GetCache(null).Cache, Is.Not.Null);
548+
Assert.That(persister.GetCache(null).Cache, Is.TypeOf<BatchableCache>());
549+
var cache = (BatchableCache) persister.GetCache(null).Cache;
548550
var ids = new List<int>();
549551

550552
await (cache.ClearAsync(CancellationToken.None));
@@ -592,9 +594,9 @@ public async Task MultiplePutReadWriteTestAsync()
592594
public async Task MultiplePutReadWriteItemTestAsync()
593595
{
594596
var persister = Sfi.GetCollectionPersister($"{typeof(ReadWrite).FullName}.Items");
595-
Assert.That(persister.Cache.Cache, Is.Not.Null);
596-
Assert.That(persister.Cache.Cache, Is.TypeOf<BatchableCache>());
597-
var cache = (BatchableCache) persister.Cache.Cache;
597+
Assert.That(persister.GetCache(null).Cache, Is.Not.Null);
598+
Assert.That(persister.GetCache(null).Cache, Is.TypeOf<BatchableCache>());
599+
var cache = (BatchableCache) persister.GetCache(null).Cache;
598600
var ids = new List<int>();
599601

600602
await (cache.ClearAsync(CancellationToken.None));
@@ -869,7 +871,7 @@ public async Task QueryCacheTestAsync()
869871
public async Task QueryEntityBatchCacheTestAsync(bool clearEntityCacheAfterQuery, CancellationToken cancellationToken = default(CancellationToken))
870872
{
871873
var persister = Sfi.GetEntityPersister(typeof(ReadOnlyItem).FullName);
872-
var cache = (BatchableCache) persister.Cache.Cache;
874+
var cache = (BatchableCache) persister.GetCache(null).Cache;
873875
var queryCache = GetDefaultQueryCache();
874876

875877
Sfi.Statistics.Clear();
@@ -945,9 +947,9 @@ public async Task QueryCacheTestAsync()
945947
var persister = Sfi.GetEntityPersister(typeof(ReadOnly).FullName);
946948
var itemPersister = Sfi.GetEntityPersister(typeof(ReadOnlyItem).FullName);
947949
var collectionPersister = Sfi.GetCollectionPersister($"{typeof(ReadOnly).FullName}.Items");
948-
var cache = (BatchableCache) persister.Cache.Cache;
949-
var itemCache = (BatchableCache) itemPersister.Cache.Cache;
950-
var collectionCache = (BatchableCache) collectionPersister.Cache.Cache;
950+
var cache = (BatchableCache) persister.GetCache(null).Cache;
951+
var itemCache = (BatchableCache) itemPersister.GetCache(null).Cache;
952+
var collectionCache = (BatchableCache) collectionPersister.GetCache(null).Cache;
951953
var queryCache = GetDefaultQueryCache();
952954

953955
int middleId;
@@ -1089,8 +1091,8 @@ public async Task QueryCacheTestAsync()
10891091

10901092
var persister = Sfi.GetEntityPersister(typeof(ReadOnlyItem).FullName);
10911093
var parentPersister = Sfi.GetEntityPersister(typeof(ReadOnly).FullName);
1092-
var cache = (BatchableCache) persister.Cache.Cache;
1093-
var parentCache = (BatchableCache) parentPersister.Cache.Cache;
1094+
var cache = (BatchableCache) persister.GetCache(null).Cache;
1095+
var parentCache = (BatchableCache) parentPersister.GetCache(null).Cache;
10941096
var queryCache = GetDefaultQueryCache();
10951097

10961098
int middleId;
@@ -1217,7 +1219,7 @@ private async Task AssertMultipleCacheCallsAsync<TEntity>(IEnumerable<int> loadI
12171219
where TEntity : CacheEntity
12181220
{
12191221
var persister = Sfi.GetEntityPersister(typeof(TEntity).FullName);
1220-
var cache = (BatchableCache) persister.Cache.Cache;
1222+
var cache = (BatchableCache) persister.GetCache(null).Cache;
12211223
await (cache.ClearAsync(cancellationToken));
12221224

12231225
if (cacheBeforeLoadFn != null)
@@ -1283,7 +1285,7 @@ private void AssertEquivalent(List<int> ids, int[][] expectedIdIndexes, List<obj
12831285
private async Task AssertMultipleCacheCollectionCallsAsync(List<int> ids, int idIndex, int[][] fetchedIdIndexes, int[] putIdIndexes, Func<int, bool> cacheBeforeLoadFn = null, CancellationToken cancellationToken = default(CancellationToken))
12841286
{
12851287
var persister = Sfi.GetCollectionPersister($"{typeof(ReadOnly).FullName}.Items");
1286-
var cache = (BatchableCache) persister.Cache.Cache;
1288+
var cache = (BatchableCache) persister.GetCache(null).Cache;
12871289
await (cache.ClearAsync(cancellationToken));
12881290

12891291
if (cacheBeforeLoadFn != null)

‎src/NHibernate.Test/Async/CacheTest/BatchableCacheSubclassFixture.cs

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,12 @@
88
//------------------------------------------------------------------------------
99

1010

11-
using System;
12-
using System.Collections;
1311
using System.Collections.Generic;
1412
using System.Linq;
1513
using NHibernate.Cache;
1614
using NHibernate.Cfg;
1715
using NHibernate.DomainModel;
16+
using NHibernate.Persister.Entity;
1817
using NHibernate.Test.CacheTest.Caches;
1918
using NUnit.Framework;
2019

@@ -91,14 +90,14 @@ protected override void OnTearDown()
9190
public async Task BatchableRootEntityTestAsync()
9291
{
9392
var persister = Sfi.GetEntityPersister(typeof(Foo).FullName);
94-
Assert.That(persister.Cache.Cache, Is.Not.Null);
95-
Assert.That(persister.Cache.Cache, Is.TypeOf<BatchableCache>());
96-
var fooCache = (BatchableCache) persister.Cache.Cache;
93+
Assert.That(persister.GetCache(null).Cache, Is.Not.Null);
94+
Assert.That(persister.GetCache(null).Cache, Is.TypeOf<BatchableCache>());
95+
var fooCache = (BatchableCache) persister.GetCache(null).Cache;
9796

9897
persister = Sfi.GetEntityPersister(typeof(Bar).FullName);
99-
Assert.That(persister.Cache.Cache, Is.Not.Null);
100-
Assert.That(persister.Cache.Cache, Is.TypeOf<BatchableCache>());
101-
var barCache = (BatchableCache) persister.Cache.Cache;
98+
Assert.That(persister.GetCache(null).Cache, Is.Not.Null);
99+
Assert.That(persister.GetCache(null).Cache, Is.TypeOf<BatchableCache>());
100+
var barCache = (BatchableCache) persister.GetCache(null).Cache;
102101

103102
Assert.That(barCache, Is.EqualTo(fooCache));
104103

‎src/NHibernate.Test/Async/CacheTest/BuildCacheFixture.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@
1515
using NHibernate.Cache;
1616
using NHibernate.Cfg;
1717
using NHibernate.Engine;
18+
using NHibernate.Persister.Collection;
19+
using NHibernate.Persister.Entity;
1820
using NHibernate.Util;
1921
using NUnit.Framework;
2022
using Environment = NHibernate.Cfg.Environment;

‎src/NHibernate.Test/Async/FilterTest/DynamicFilterTest.cs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
using NHibernate.Cache;
1616
using NHibernate.Cache.Entry;
1717
using NHibernate.Criterion;
18+
using NHibernate.Persister.Collection;
1819
using NHibernate.Transform;
1920
using NUnit.Framework;
2021

@@ -54,7 +55,7 @@ public async Task SecondLevelCachedCollectionsFilteringAsync()
5455
var sp = (Salesperson) await (session.LoadAsync(typeof(Salesperson), testData.steveId));
5556
await (NHibernateUtil.InitializeAsync(sp.Orders));
5657
Assert.IsTrue(persister.HasCache, "No cache for collection");
57-
cachedData = (CollectionCacheEntry) await (persister.Cache.Cache.GetAsync(cacheKey, CancellationToken.None));
58+
cachedData = (CollectionCacheEntry) await (persister.GetCache(null).Cache.GetAsync(cacheKey, CancellationToken.None));
5859
Assert.IsNotNull(cachedData, "collection was not in cache");
5960
}
6061

@@ -66,7 +67,7 @@ public async Task SecondLevelCachedCollectionsFilteringAsync()
6667
.UniqueResultAsync());
6768
Assert.AreEqual(1, sp.Orders.Count, "Filtered-collection not bypassing 2L-cache");
6869

69-
CollectionCacheEntry cachedData2 = (CollectionCacheEntry) await (persister.Cache.Cache.GetAsync(cacheKey, CancellationToken.None));
70+
CollectionCacheEntry cachedData2 = (CollectionCacheEntry) await (persister.GetCache(null).Cache.GetAsync(cacheKey, CancellationToken.None));
7071
Assert.IsNotNull(cachedData2, "collection no longer in cache!");
7172
Assert.AreSame(cachedData, cachedData2, "Different cache values!");
7273
}

‎src/NHibernate.Test/Async/LazyGroup/LazyGroupFixture.cs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
using System.Threading.Tasks;
1515
using NHibernate.Cache;
1616
using NHibernate.Cfg;
17+
using NHibernate.Persister.Entity;
1718
using NUnit.Framework;
1819

1920
namespace NHibernate.Test.LazyGroup
@@ -135,7 +136,7 @@ public async Task TestGroupsAsync()
135136
public async Task TestCacheAsync()
136137
{
137138
var persister = Sfi.GetEntityPersister(typeof(Person).FullName);
138-
var cache = (HashtableCache) persister.Cache.Cache;
139+
var cache = (HashtableCache) persister.GetCache(null).Cache;
139140
await (cache.ClearAsync(CancellationToken.None));
140141

141142
using (var s = OpenSession())
@@ -171,7 +172,7 @@ public async Task TestCacheAsync()
171172
public async Task TestInitializeFromCacheAsync()
172173
{
173174
var persister = Sfi.GetEntityPersister(typeof(Person).FullName);
174-
var cache = (HashtableCache) persister.Cache.Cache;
175+
var cache = (HashtableCache) persister.GetCache(null).Cache;
175176
await (cache.ClearAsync(CancellationToken.None));
176177
Sfi.Statistics.Clear();
177178

‎src/NHibernate.Test/BulkManipulation/BulkOperationCleanupActionFixture.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -51,20 +51,20 @@ public void AfterTransactionCompletionProcess_EvictsFromCache(string querySpaces
5151

5252
if (expectedEntityEvictionCount > 0)
5353
{
54-
_factory.Received(1).EvictEntity(Arg.Is<IEnumerable<string>>(x => x.Count() == expectedEntityEvictionCount));
54+
_factory.Received(1).EvictEntity(Arg.Is<IEnumerable<string>>(x => x.Count() == expectedEntityEvictionCount), null);
5555
}
5656
else
5757
{
58-
_factory.DidNotReceive().EvictEntity(Arg.Any<IEnumerable<string>>());
58+
_factory.DidNotReceive().EvictEntity(Arg.Any<IEnumerable<string>>(), null);
5959
}
6060

6161
if (expectedCollectionEvictionCount > 0)
6262
{
63-
_factory.Received(1).EvictCollection(Arg.Is<IEnumerable<string>>(x => x.Count() == expectedCollectionEvictionCount));
63+
_factory.Received(1).EvictCollection(Arg.Is<IEnumerable<string>>(x => x.Count() == expectedCollectionEvictionCount), null);
6464
}
6565
else
6666
{
67-
_factory.DidNotReceive().EvictCollection(Arg.Any<IEnumerable<string>>());
67+
_factory.DidNotReceive().EvictCollection(Arg.Any<IEnumerable<string>>(), null);
6868
}
6969
}
7070
}

‎src/NHibernate.Test/CacheTest/BatchableCacheFixture.cs

Lines changed: 22 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@
66
using NHibernate.Cfg;
77
using NHibernate.Linq;
88
using NHibernate.Multi;
9+
using NHibernate.Persister.Collection;
10+
using NHibernate.Persister.Entity;
911
using NHibernate.Test.CacheTest.Caches;
1012
using NUnit.Framework;
1113
using Environment = NHibernate.Cfg.Environment;
@@ -96,8 +98,8 @@ protected override void OnTearDown()
9698
public void MultipleGetReadOnlyCollectionTest()
9799
{
98100
var persister = Sfi.GetCollectionPersister($"{typeof(ReadOnly).FullName}.Items");
99-
Assert.That(persister.Cache.Cache, Is.Not.Null);
100-
Assert.That(persister.Cache.Cache, Is.TypeOf<BatchableCache>());
101+
Assert.That(persister.GetCache(null).Cache, Is.Not.Null);
102+
Assert.That(persister.GetCache(null).Cache, Is.TypeOf<BatchableCache>());
101103
var ids = new List<int>();
102104

103105
using (var s = Sfi.OpenSession())
@@ -206,8 +208,8 @@ public void MultipleGetReadOnlyCollectionTest()
206208
public void MultipleGetReadOnlyTest()
207209
{
208210
var persister = Sfi.GetEntityPersister(typeof(ReadOnly).FullName);
209-
Assert.That(persister.Cache.Cache, Is.Not.Null);
210-
Assert.That(persister.Cache.Cache, Is.TypeOf<BatchableCache>());
211+
Assert.That(persister.GetCache(null).Cache, Is.Not.Null);
212+
Assert.That(persister.GetCache(null).Cache, Is.TypeOf<BatchableCache>());
211213
int[] getIds;
212214
int[] loadIds;
213215

@@ -368,8 +370,8 @@ public void MultipleGetReadOnlyTest()
368370
public void MultipleGetReadOnlyItemTest()
369371
{
370372
var persister = Sfi.GetEntityPersister(typeof(ReadOnlyItem).FullName);
371-
Assert.That(persister.Cache.Cache, Is.Not.Null);
372-
Assert.That(persister.Cache.Cache, Is.TypeOf<BatchableCache>());
373+
Assert.That(persister.GetCache(null).Cache, Is.Not.Null);
374+
Assert.That(persister.GetCache(null).Cache, Is.TypeOf<BatchableCache>());
373375
int[] getIds;
374376
int[] loadIds;
375377

@@ -530,9 +532,9 @@ public void MultipleGetReadOnlyItemTest()
530532
public void MultiplePutReadWriteTest()
531533
{
532534
var persister = Sfi.GetEntityPersister(typeof(ReadWrite).FullName);
533-
Assert.That(persister.Cache.Cache, Is.Not.Null);
534-
Assert.That(persister.Cache.Cache, Is.TypeOf<BatchableCache>());
535-
var cache = (BatchableCache) persister.Cache.Cache;
535+
Assert.That(persister.GetCache(null).Cache, Is.Not.Null);
536+
Assert.That(persister.GetCache(null).Cache, Is.TypeOf<BatchableCache>());
537+
var cache = (BatchableCache) persister.GetCache(null).Cache;
536538
var ids = new List<int>();
537539

538540
cache.Clear();
@@ -580,9 +582,9 @@ public void MultiplePutReadWriteTest()
580582
public void MultiplePutReadWriteItemTest()
581583
{
582584
var persister = Sfi.GetCollectionPersister($"{typeof(ReadWrite).FullName}.Items");
583-
Assert.That(persister.Cache.Cache, Is.Not.Null);
584-
Assert.That(persister.Cache.Cache, Is.TypeOf<BatchableCache>());
585-
var cache = (BatchableCache) persister.Cache.Cache;
585+
Assert.That(persister.GetCache(null).Cache, Is.Not.Null);
586+
Assert.That(persister.GetCache(null).Cache, Is.TypeOf<BatchableCache>());
587+
var cache = (BatchableCache) persister.GetCache(null).Cache;
586588
var ids = new List<int>();
587589

588590
cache.Clear();
@@ -857,7 +859,7 @@ public void QueryCacheTest()
857859
public void QueryEntityBatchCacheTest(bool clearEntityCacheAfterQuery)
858860
{
859861
var persister = Sfi.GetEntityPersister(typeof(ReadOnlyItem).FullName);
860-
var cache = (BatchableCache) persister.Cache.Cache;
862+
var cache = (BatchableCache) persister.GetCache(null).Cache;
861863
var queryCache = GetDefaultQueryCache();
862864

863865
Sfi.Statistics.Clear();
@@ -933,9 +935,9 @@ public void QueryFetchCollectionBatchCacheTest(bool clearEntityCacheAfterQuery,
933935
var persister = Sfi.GetEntityPersister(typeof(ReadOnly).FullName);
934936
var itemPersister = Sfi.GetEntityPersister(typeof(ReadOnlyItem).FullName);
935937
var collectionPersister = Sfi.GetCollectionPersister($"{typeof(ReadOnly).FullName}.Items");
936-
var cache = (BatchableCache) persister.Cache.Cache;
937-
var itemCache = (BatchableCache) itemPersister.Cache.Cache;
938-
var collectionCache = (BatchableCache) collectionPersister.Cache.Cache;
938+
var cache = (BatchableCache) persister.GetCache(null).Cache;
939+
var itemCache = (BatchableCache) itemPersister.GetCache(null).Cache;
940+
var collectionCache = (BatchableCache) collectionPersister.GetCache(null).Cache;
939941
var queryCache = GetDefaultQueryCache();
940942

941943
int middleId;
@@ -1077,8 +1079,8 @@ public void QueryFetchEntityBatchCacheTest(bool clearEntityCacheAfterQuery, bool
10771079

10781080
var persister = Sfi.GetEntityPersister(typeof(ReadOnlyItem).FullName);
10791081
var parentPersister = Sfi.GetEntityPersister(typeof(ReadOnly).FullName);
1080-
var cache = (BatchableCache) persister.Cache.Cache;
1081-
var parentCache = (BatchableCache) parentPersister.Cache.Cache;
1082+
var cache = (BatchableCache) persister.GetCache(null).Cache;
1083+
var parentCache = (BatchableCache) parentPersister.GetCache(null).Cache;
10821084
var queryCache = GetDefaultQueryCache();
10831085

10841086
int middleId;
@@ -1205,7 +1207,7 @@ private void AssertMultipleCacheCalls<TEntity>(IEnumerable<int> loadIds, IReadO
12051207
where TEntity : CacheEntity
12061208
{
12071209
var persister = Sfi.GetEntityPersister(typeof(TEntity).FullName);
1208-
var cache = (BatchableCache) persister.Cache.Cache;
1210+
var cache = (BatchableCache) persister.GetCache(null).Cache;
12091211
cache.Clear();
12101212

12111213
if (cacheBeforeLoadFn != null)
@@ -1271,7 +1273,7 @@ private void AssertEquivalent(List<int> ids, int[][] expectedIdIndexes, List<obj
12711273
private void AssertMultipleCacheCollectionCalls(List<int> ids, int idIndex, int[][] fetchedIdIndexes, int[] putIdIndexes, Func<int, bool> cacheBeforeLoadFn = null)
12721274
{
12731275
var persister = Sfi.GetCollectionPersister($"{typeof(ReadOnly).FullName}.Items");
1274-
var cache = (BatchableCache) persister.Cache.Cache;
1276+
var cache = (BatchableCache) persister.GetCache(null).Cache;
12751277
cache.Clear();
12761278

12771279
if (cacheBeforeLoadFn != null)

‎src/NHibernate.Test/CacheTest/BatchableCacheSubclassFixture.cs

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
1-
using System;
2-
using System.Collections;
3-
using System.Collections.Generic;
1+
using System.Collections.Generic;
42
using System.Linq;
53
using NHibernate.Cache;
64
using NHibernate.Cfg;
75
using NHibernate.DomainModel;
6+
using NHibernate.Persister.Entity;
87
using NHibernate.Test.CacheTest.Caches;
98
using NUnit.Framework;
109

@@ -80,14 +79,14 @@ protected override void OnTearDown()
8079
public void BatchableRootEntityTest()
8180
{
8281
var persister = Sfi.GetEntityPersister(typeof(Foo).FullName);
83-
Assert.That(persister.Cache.Cache, Is.Not.Null);
84-
Assert.That(persister.Cache.Cache, Is.TypeOf<BatchableCache>());
85-
var fooCache = (BatchableCache) persister.Cache.Cache;
82+
Assert.That(persister.GetCache(null).Cache, Is.Not.Null);
83+
Assert.That(persister.GetCache(null).Cache, Is.TypeOf<BatchableCache>());
84+
var fooCache = (BatchableCache) persister.GetCache(null).Cache;
8685

8786
persister = Sfi.GetEntityPersister(typeof(Bar).FullName);
88-
Assert.That(persister.Cache.Cache, Is.Not.Null);
89-
Assert.That(persister.Cache.Cache, Is.TypeOf<BatchableCache>());
90-
var barCache = (BatchableCache) persister.Cache.Cache;
87+
Assert.That(persister.GetCache(null).Cache, Is.Not.Null);
88+
Assert.That(persister.GetCache(null).Cache, Is.TypeOf<BatchableCache>());
89+
var barCache = (BatchableCache) persister.GetCache(null).Cache;
9190

9291
Assert.That(barCache, Is.EqualTo(fooCache));
9392

0 commit comments

Comments
 (0)