Merge branch 'master' of https://github.com/ServiceStack/ServiceStack.Redis

mythz · mythz · commit 0765012fee0d · 2020-11-16T18:35:38.000+08:00
diff --git a/src/ServiceStack.Redis/RedisNativeClient_Utils.cs b/src/ServiceStack.Redis/RedisNativeClient_Utils.cs
@@ -566,7 +566,7 @@ internal void Activate(bool newClient=false)
             {
                 //Drain any existing buffers 
                 ResetSendBuffer();
-                bufferedReader.Reset();
+                bufferedReader?.Reset();
                 if (socket?.Available > 0)
                 {
                     logDebug($"Draining existing socket of {socket.Available} bytes");
diff --git a/tests/ServiceStack.Redis.Tests/CacheClientTests.Async.cs b/tests/ServiceStack.Redis.Tests/CacheClientTests.Async.cs
@@ -4,7 +4,6 @@
 namespace ServiceStack.Redis.Tests
 {
     public class CacheClientTestsAsync
-        : RedisClientTestsBaseAsync
     {
         IRedisClientsManagerAsync redisManager = new RedisManagerPool(TestConfig.SingleHost);
         

Original file line number	Diff line number	Diff line change
`@@ -566,7 +566,7 @@ internal void Activate(bool newClient=false)`
`566`	`566`	`{`
`567`	`567`	`//Drain any existing buffers`
`568`	`568`	`ResetSendBuffer();`
`569`		`- bufferedReader.Reset();`
	`569`	`+ bufferedReader?.Reset();`
`570`	`570`	`if (socket?.Available > 0)`
`571`	`571`	`{`
`572`	`572`	`logDebug($"Draining existing socket of {socket.Available} bytes");`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,6 @@`
`4`	`4`	`namespace ServiceStack.Redis.Tests`
`5`	`5`	`{`
`6`	`6`	`public class CacheClientTestsAsync`
`7`		`- : RedisClientTestsBaseAsync`
`8`	`7`	`{`
`9`	`8`	`IRedisClientsManagerAsync redisManager = new RedisManagerPool(TestConfig.SingleHost);`
`10`	`9`