v3.8.668 fix: XPending bug #457

2881099 · Sep 6, 2022 · 5908252 · 5908252
1 parent 266b9a9
commit 5908252
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 2 deletions.
diff --git a/src/CSRedisCore/CSRedisCore.csproj b/src/CSRedisCore/CSRedisCore.csproj
@@ -4,7 +4,7 @@
 		<AssemblyName>CSRedisCore</AssemblyName>
 		<PackageId>CSRedisCore</PackageId>
 		<RootNamespace>CSRedisCore</RootNamespace>
-		<Version>3.8.666</Version>
+		<Version>3.8.668</Version>
 		<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
 		<PackageProjectUrl>https://github.com/2881099/csredis</PackageProjectUrl>
 		<Description>CSRedis 是 redis.io 官方推荐库，支持 redis-trib集群、哨兵、私有分区与连接池管理技术，简易 RedisHelper 静态类。</Description>

diff --git a/src/CSRedisCore/Internal/ObjectPool/ObjectPool.cs b/src/CSRedisCore/Internal/ObjectPool/ObjectPool.cs
@@ -116,6 +116,15 @@ private void CheckAvailable(int interval)
 
                         try
                         {
+                            try
+                            {
+                                Policy.OnCheckAvailable(conn);
+                                break;
+                            }
+                            catch
+                            {
+                                conn.ResetValue();
+                            }
                             if (Policy.OnCheckAvailable(conn) == false) throw new Exception("CheckAvailable 应抛出异常，代表仍然不可用。");
                             break;
                         }

diff --git a/src/Microsoft.Extensions.Caching.CSRedis/Microsoft.Extensions.Caching.CSRedis.csproj b/src/Microsoft.Extensions.Caching.CSRedis/Microsoft.Extensions.Caching.CSRedis.csproj
@@ -4,7 +4,7 @@
 		<AssemblyName>Caching.CSRedis</AssemblyName>
 		<PackageId>Caching.CSRedis</PackageId>
 		<RootNamespace>Caching.CSRedis</RootNamespace>
-		<Version>3.8.666</Version>
+		<Version>3.8.668</Version>
 		<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
 		<PackageProjectUrl>https://github.com/2881099/csredis/tree/master/src/Microsoft.Extensions.Caching.CSRedis/README.md</PackageProjectUrl>
 		<Description>分布式缓存 CSRedisCore 实现 Microsoft.Extensions.Caching</Description>
-Original file line number
+Diff line change
@@ Expand Up / @@ -116,6 +116,15 @@ private void CheckAvailable(int interval) @@
                             try
                             {
+                                try
+                                {
+                                    Policy.OnCheckAvailable(conn);
+                                    break;
+                                }
+                                catch
+                                {
+                                    conn.ResetValue();
+                                }
                                 if (Policy.OnCheckAvailable(conn) == false) throw new Exception("CheckAvailable 应抛出异常，代表仍然不可用。");
                                 break;
                             }
@@ Expand Down @@