From bc78cef13aeb628dcd141613d2421b2fc9ae137c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=83=A4=5Fsomnuscy?= <somnuscy3344@163.com>
Date: Thu, 4 Mar 2021 18:37:58 +0800
Subject: [PATCH] update
 src/main/java/io/jboot/components/cache/redis/JbootRedisCacheImpl.java.

---
 .../cache/redis/JbootRedisCacheImpl.java         | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/main/java/io/jboot/components/cache/redis/JbootRedisCacheImpl.java b/src/main/java/io/jboot/components/cache/redis/JbootRedisCacheImpl.java
index bffd9f42..dd69ac05 100644
--- a/src/main/java/io/jboot/components/cache/redis/JbootRedisCacheImpl.java
+++ b/src/main/java/io/jboot/components/cache/redis/JbootRedisCacheImpl.java
@@ -88,11 +88,11 @@ public class JbootRedisCacheImpl extends JbootCacheBase {
     public void removeAll(String cacheName) {
         String cursor = "0";
         int scanCount = 1000;
-        List<String> scanKeys = null;
+        boolean continueState = true;
         do {
             RedisScanResult redisScanResult = redis.scan(cacheName + ":*", cursor, scanCount);
             if (redisScanResult != null) {
-                scanKeys = redisScanResult.getResults();
+                List<String> scanKeys = redisScanResult.getResults();
                 cursor = redisScanResult.getCursor();
 
                 if (scanKeys != null && scanKeys.size() > 0){
@@ -101,10 +101,10 @@ public class JbootRedisCacheImpl extends JbootCacheBase {
 
                 if (redisScanResult.isCompleteIteration()) {
                     //终止循环
-                    scanKeys = null;
+                    continueState = false;
                 }
             }
-        } while (scanKeys != null && scanKeys.size() != 0);
+        } while (continueState);
 
         redis.srem(redisCacheNamesKey, cacheName);
     }
@@ -176,11 +176,11 @@ public class JbootRedisCacheImpl extends JbootCacheBase {
         List<String> keys = new ArrayList<>();
         String cursor = "0";
         int scanCount = 1000;
-        List<String> scanKeys = null;
+        boolean continueState = true;
         do {
             RedisScanResult redisScanResult = redis.scan(cacheName + ":*", cursor, scanCount);
             if (redisScanResult != null) {
-                scanKeys = redisScanResult.getResults();
+                List<String> scanKeys = redisScanResult.getResults();
                 cursor = redisScanResult.getCursor();
 
                 if (scanKeys != null && scanKeys.size() > 0) {
@@ -191,10 +191,10 @@ public class JbootRedisCacheImpl extends JbootCacheBase {
 
                 if (redisScanResult.isCompleteIteration()) {
                     //终止循环
-                    scanKeys = null;
+                    continueState = false;
                 }
             }
-        } while (scanKeys != null && scanKeys.size() != 0);
+        } while (continueState);
 
         return keys;
     }
-- 
Gitee