From 2fda52e86527314878f8de736b947337ab9b2789 Mon Sep 17 00:00:00 2001
From: Halil ibrahim Kalkan <hi_kalkan@yahoo.com>
Date: Wed, 20 Feb 2019 13:20:14 +0300
Subject: [PATCH] Use cancellationtoken

---
 .../Threading/HttpContextCancellationTokenProvider.cs           | 2 +-
 .../src/Volo.Abp.Caching/Volo/Abp/Caching/DistributedCache.cs   | 2 +-
 .../Volo/Abp/Threading/NullCancellationTokenProvider.cs         | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/framework/src/Volo.Abp.AspNetCore/Volo/Abp/AspNetCore/Threading/HttpContextCancellationTokenProvider.cs b/framework/src/Volo.Abp.AspNetCore/Volo/Abp/AspNetCore/Threading/HttpContextCancellationTokenProvider.cs
index 4757ce2f93..c7c961176c 100644
--- a/framework/src/Volo.Abp.AspNetCore/Volo/Abp/AspNetCore/Threading/HttpContextCancellationTokenProvider.cs
+++ b/framework/src/Volo.Abp.AspNetCore/Volo/Abp/AspNetCore/Threading/HttpContextCancellationTokenProvider.cs
@@ -8,7 +8,7 @@ namespace Volo.Abp.AspNetCore.Threading
     [Dependency(ReplaceServices = true)]
     public class HttpContextCancellationTokenProvider : ICancellationTokenProvider, ITransientDependency
     {
-        public CancellationToken Token => _httpContextAccessor.HttpContext?.RequestAborted ?? default;
+        public CancellationToken Token => _httpContextAccessor.HttpContext?.RequestAborted ?? CancellationToken.None;
 
         private readonly IHttpContextAccessor _httpContextAccessor;
 
diff --git a/framework/src/Volo.Abp.Caching/Volo/Abp/Caching/DistributedCache.cs b/framework/src/Volo.Abp.Caching/Volo/Abp/Caching/DistributedCache.cs
index 835ad16ca7..477b0c764b 100644
--- a/framework/src/Volo.Abp.Caching/Volo/Abp/Caching/DistributedCache.cs
+++ b/framework/src/Volo.Abp.Caching/Volo/Abp/Caching/DistributedCache.cs
@@ -127,7 +127,7 @@ namespace Volo.Abp.Caching
                 return value;
             }
 
-            using (AsyncLock.Lock())
+            using (AsyncLock.Lock(CancellationTokenProvider.Token))
             {
                 value = Get(key, hideErrors);
                 if (value != null)
diff --git a/framework/src/Volo.Abp.Threading/Volo/Abp/Threading/NullCancellationTokenProvider.cs b/framework/src/Volo.Abp.Threading/Volo/Abp/Threading/NullCancellationTokenProvider.cs
index 1d02ecb1e9..ab6320546c 100644
--- a/framework/src/Volo.Abp.Threading/Volo/Abp/Threading/NullCancellationTokenProvider.cs
+++ b/framework/src/Volo.Abp.Threading/Volo/Abp/Threading/NullCancellationTokenProvider.cs
@@ -6,7 +6,7 @@ namespace Volo.Abp.Threading
     {
         public static NullCancellationTokenProvider Instance { get; } = new NullCancellationTokenProvider();
 
-        public CancellationToken Token { get; } = default;
+        public CancellationToken Token { get; } = CancellationToken.None;
 
         private NullCancellationTokenProvider()
         {