Skip to content

Commit 47e7de2

Browse files
catcherwongcatcherwong
authored
Merge pull request #112 from dotnetcore/dev
 fix typo: IsHightAvailability -> IsHighAvailability
2 parents 148a556 + b25fd98 commit 47e7de2

File tree

7 files changed

+38
-38
lines changed

7 files changed

+38
-38
lines changed

‎build/releasenotes.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project>
22
<PropertyGroup>
33
<EasyCachingCorePackageNotes>
4-
1. Upgrading dependencies.
4+
1. fix typo: IsHightAvailability -> IsHighAvailability.
55
</EasyCachingCorePackageNotes>
66
<EasyCachingMemcachedPackageNotes>
77
1. Upgrading dependencies.

‎build/version.props

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
11
<Project>
22
<PropertyGroup>
3-
<EasyCachingCorePackageVersion>0.5.5</EasyCachingCorePackageVersion>
4-
<EasyCachingMemcachedPackageVersion>0.5.5</EasyCachingMemcachedPackageVersion>
5-
<EasyCachingRedisPackageVersion>0.5.5</EasyCachingRedisPackageVersion>
6-
<EasyCachingSQLitePackageVersion>0.5.5</EasyCachingSQLitePackageVersion>
7-
<EasyCachingInMemoryPackageVersion>0.5.5</EasyCachingInMemoryPackageVersion>
8-
<EasyCachingHybridPackageVersion>0.5.5</EasyCachingHybridPackageVersion>
9-
<EasyCachingAspectCorePackageVersion>0.5.5</EasyCachingAspectCorePackageVersion>
10-
<EasyCachingCastlePackageVersion>0.5.5</EasyCachingCastlePackageVersion>
11-
<EasyCachingResponseCachingPackageVersion>0.5.5</EasyCachingResponseCachingPackageVersion>
12-
<EasyCachingJsonPackageVersion>0.5.5</EasyCachingJsonPackageVersion>
13-
<EasyCachingMessagePackPackageVersion>0.5.5</EasyCachingMessagePackPackageVersion>
14-
<EasyCachingProtobufPackageVersion>0.5.5</EasyCachingProtobufPackageVersion>
15-
<EasyCachingCSRedisPackageVersion>0.5.5</EasyCachingCSRedisPackageVersion>
16-
<EasyCachingRedisBusPackageVersion>0.5.5</EasyCachingRedisBusPackageVersion>
17-
<EasyCachingCSRedisBusPackageVersion>0.5.5</EasyCachingCSRedisBusPackageVersion>
18-
<EasyCachingRabbitBusPackageVersion>0.5.5</EasyCachingRabbitBusPackageVersion>
3+
<EasyCachingCorePackageVersion>0.5.6</EasyCachingCorePackageVersion>
4+
<EasyCachingMemcachedPackageVersion>0.5.6</EasyCachingMemcachedPackageVersion>
5+
<EasyCachingRedisPackageVersion>0.5.6</EasyCachingRedisPackageVersion>
6+
<EasyCachingSQLitePackageVersion>0.5.6</EasyCachingSQLitePackageVersion>
7+
<EasyCachingInMemoryPackageVersion>0.5.6</EasyCachingInMemoryPackageVersion>
8+
<EasyCachingHybridPackageVersion>0.5.6</EasyCachingHybridPackageVersion>
9+
<EasyCachingAspectCorePackageVersion>0.5.6</EasyCachingAspectCorePackageVersion>
10+
<EasyCachingCastlePackageVersion>0.5.6</EasyCachingCastlePackageVersion>
11+
<EasyCachingResponseCachingPackageVersion>0.5.6</EasyCachingResponseCachingPackageVersion>
12+
<EasyCachingJsonPackageVersion>0.5.6</EasyCachingJsonPackageVersion>
13+
<EasyCachingMessagePackPackageVersion>0.5.6</EasyCachingMessagePackPackageVersion>
14+
<EasyCachingProtobufPackageVersion>0.5.6</EasyCachingProtobufPackageVersion>
15+
<EasyCachingCSRedisPackageVersion>0.5.6</EasyCachingCSRedisPackageVersion>
16+
<EasyCachingRedisBusPackageVersion>0.5.6</EasyCachingRedisBusPackageVersion>
17+
<EasyCachingCSRedisBusPackageVersion>0.5.6</EasyCachingCSRedisBusPackageVersion>
18+
<EasyCachingRabbitBusPackageVersion>0.5.6</EasyCachingRabbitBusPackageVersion>
1919
</PropertyGroup>
2020
</Project>

‎docs/AspectCore.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ Property | Description | Apply
3434
---|---|---
3535
CacheKeyPrefix | To specify the prefix of your cache key | All
3636
CacheProviderName | To specify which provider you want to use | All
37-
IsHightAvailability | Whether caching opreation will break your method | All
37+
IsHighAvailability | Whether caching opreation will break your method | All
3838
Expiration | To specify the expiration of your cache item，the unit is second | EasyCachingAble and EasyCachingPut
3939
IsAll | Whether remove all the cached items start with the CacheKeyPrefix | EasyCachingEvict only
4040
IsBefore | Remove the cached item before method excute or after method excute | EasyCachingEvict only

‎docs/Castle.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ Property | Description | Apply
3434
---|---|---
3535
CacheKeyPrefix | To specify the prefix of your cache key | All
3636
CacheProviderName | To specify which provider you want to use | All
37-
IsHightAvailability | Whether caching opreation will break your method | All
37+
IsHighAvailability | Whether caching opreation will break your method | All
3838
Expiration | To specify the expiration of your cache item，the unit is second | EasyCachingAble and EasyCachingPut
3939
IsAll | Whether remove all the cached items start with the CacheKeyPrefix | EasyCachingEvict only
4040
IsBefore | Remove the cached item before method excute or after method excute | EasyCachingEvict only

‎src/EasyCaching.Core/Interceptor/EasyCachingInterceptorAttribute.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ public class EasyCachingInterceptorAttribute : Attribute
3131
/// Prevent cache provider errors from affecting business
3232
/// </summary>
3333
/// <value>The cache key prefix.</value>
34-
public bool IsHightAvailability { get; set; } = true;
34+
public bool IsHighAvailability { get; set; } = true;
3535
}
3636

3737
/// <summary>

‎src/EasyCaching.Interceptor.AspectCore/EasyCachingInterceptor.cs

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ private async Task ProceedAbleAsync(AspectContext context, AspectDelegate next)
107107
}
108108
catch (Exception ex)
109109
{
110-
if (!attribute.IsHightAvailability)
110+
if (!attribute.IsHighAvailability)
111111
{
112112
throw;
113113
}
@@ -142,20 +142,20 @@ private async Task ProceedAbleAsync(AspectContext context, AspectDelegate next)
142142
// Invoke the method if we don't have a cache hit
143143
await next(context);
144144

145-
if (isAvailable)
146-
{
147-
// get the result
148-
var returnValue = context.IsAsync()
149-
? await context.UnwrapAsyncReturnValue()
150-
: context.ReturnValue;
151-
145+
if (isAvailable)
146+
{
147+
// get the result
148+
var returnValue = context.IsAsync()
149+
? await context.UnwrapAsyncReturnValue()
150+
: context.ReturnValue;
151+
152152
// should we do something when method return null?
153153
// 1. cached a null value for a short time
154-
// 2. do nothing
155-
if (returnValue != null)
156-
{
157-
await _cacheProvider.SetAsync(cacheKey, returnValue, TimeSpan.FromSeconds(attribute.Expiration));
158-
}
154+
// 2. do nothing
155+
if (returnValue != null)
156+
{
157+
await _cacheProvider.SetAsync(cacheKey, returnValue, TimeSpan.FromSeconds(attribute.Expiration));
158+
}
159159
}
160160
}
161161
}
@@ -194,7 +194,7 @@ private async Task ProcessPutAsync(AspectContext context)
194194
}
195195
catch (Exception ex)
196196
{
197-
if (!attribute.IsHightAvailability) throw;
197+
if (!attribute.IsHighAvailability) throw;
198198
else Logger?.LogError(new EventId(), ex, $"Cache provider \"{_cacheProvider.Name}\" set error.");
199199
}
200200
}
@@ -230,7 +230,7 @@ private async Task ProcessEvictAsync(AspectContext context, bool isBefore)
230230
}
231231
catch (Exception ex)
232232
{
233-
if (!attribute.IsHightAvailability) throw;
233+
if (!attribute.IsHighAvailability) throw;
234234
else Logger?.LogError(new EventId(), ex, $"Cache provider \"{_cacheProvider.Name}\" remove error.");
235235
}
236236
}

‎src/EasyCaching.Interceptor.Castle/EasyCachingInterceptor.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ private void ProceedAble(IInvocation invocation)
112112
}
113113
catch (Exception ex)
114114
{
115-
if (!attribute.IsHightAvailability)
115+
if (!attribute.IsHighAvailability)
116116
{
117117
throw;
118118
}
@@ -193,7 +193,7 @@ private void ProcessPut(IInvocation invocation)
193193
}
194194
catch (Exception ex)
195195
{
196-
if (!attribute.IsHightAvailability) throw;
196+
if (!attribute.IsHighAvailability) throw;
197197
else _logger?.LogError(new EventId(), ex, $"Cache provider \"{_cacheProvider.Name}\" set error.");
198198
}
199199
}
@@ -230,7 +230,7 @@ private void ProcessEvict(IInvocation invocation, bool isBefore)
230230
}
231231
catch (Exception ex)
232232
{
233-
if (!attribute.IsHightAvailability) throw;
233+
if (!attribute.IsHighAvailability) throw;
234234
else _logger?.LogError(new EventId(), ex, $"Cache provider \"{_cacheProvider.Name}\" remove error.");
235235
}
236236
}

0 commit comments

Comments
 (0)