Skip to content

Commit 7e35a6e

Browse files
committed
Rename interface
1 parent d33ccdd commit 7e35a6e

File tree

3 files changed

+4
-9
lines changed

3 files changed

+4
-9
lines changed

src/NHibernate/Cache/CacheLock.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ namespace NHibernate.Cache
1414
/// </remarks>
1515
[Serializable]
1616
[DataContract]
17-
public class CacheLock : ReadWriteCache.ILockable, ISoftLock, ReadWriteCache.ILockableNextVer
17+
public class CacheLock : ReadWriteCache.ILockable, ISoftLock, ReadWriteCache.IMinimalPutAwareLockable
1818
{
1919
private long unlockTimestamp = -1;
2020
private int multiplicity = 1;

src/NHibernate/Cache/CachedItem.cs

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ namespace NHibernate.Cache
1010
/// </summary>
1111
[Serializable]
1212
[DataContract]
13-
public class CachedItem : ReadWriteCache.ILockable, ReadWriteCache.ILockableNextVer
13+
public class CachedItem : ReadWriteCache.ILockable, ReadWriteCache.IMinimalPutAwareLockable
1414
{
1515
private long freshTimestamp;
1616
private object value;
@@ -101,11 +101,6 @@ public bool IsGettable(long txTimestamp)
101101
/// <summary>
102102
/// Don't overwrite already cached items
103103
/// </summary>
104-
/// <param name="txTimestamp"></param>
105-
/// <param name="newVersion"></param>
106-
/// <param name="comparator"></param>
107-
/// <param name="minimalPut"></param>
108-
/// <returns></returns>
109104
public bool IsPuttable(long txTimestamp, object newVersion, IComparer comparator, bool minimalPut)
110105
{
111106
if (Version == null)

src/NHibernate/Cache/ReadWriteCache.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ public static class LocableExtension
1212
//TODO 6.0: Remove after ILockableNextVer merge
1313
internal static bool IsPuttable(this ReadWriteCache.ILockable lockable, long txTimestamp, object newVersion, IComparer comparator, bool minimalPut)
1414
{
15-
if (lockable is ReadWriteCache.ILockableNextVer l)
15+
if (lockable is ReadWriteCache.IMinimalPutAwareLockable l)
1616
{
1717
return l.IsPuttable(txTimestamp, newVersion, comparator, minimalPut);
1818
}
@@ -42,7 +42,7 @@ internal static bool IsPuttable(this ReadWriteCache.ILockable lockable, long txT
4242
public partial class ReadWriteCache : IBatchableCacheConcurrencyStrategy
4343
{
4444
//TODO 6.0: Merge with ILockable
45-
internal interface ILockableNextVer
45+
internal interface IMinimalPutAwareLockable
4646
{
4747
bool IsPuttable(long txTimestamp, object newVersion, IComparer comparator, bool minimalPut);
4848
}

0 commit comments

Comments
 (0)