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 bffd9f42fa1a9527bbdb803f7e1ae5a03f6602ec..dd69ac052d61296be720de1ba2b2913fa9bc57dc 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 scanKeys = null; + boolean continueState = true; do { RedisScanResult redisScanResult = redis.scan(cacheName + ":*", cursor, scanCount); if (redisScanResult != null) { - scanKeys = redisScanResult.getResults(); + List 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 keys = new ArrayList<>(); String cursor = "0"; int scanCount = 1000; - List scanKeys = null; + boolean continueState = true; do { RedisScanResult redisScanResult = redis.scan(cacheName + ":*", cursor, scanCount); if (redisScanResult != null) { - scanKeys = redisScanResult.getResults(); + List 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; }