diff --git a/redisson/src/main/java/org/redisson/RedissonMultimap.java b/redisson/src/main/java/org/redisson/RedissonMultimap.java index 050e6cb85..0b3c3620d 100644 --- a/redisson/src/main/java/org/redisson/RedissonMultimap.java +++ b/redisson/src/main/java/org/redisson/RedissonMultimap.java @@ -110,7 +110,7 @@ public abstract class RedissonMultimap extends RedissonExpirable implement return new RedissonReadWriteLock(commandExecutor, lockName); } - protected String hash(ByteBuf objectState) { + String hash(ByteBuf objectState) { return Hash.hash128toBase64(objectState); } diff --git a/redisson/src/main/java/org/redisson/RedissonSetMultimapCache.java b/redisson/src/main/java/org/redisson/RedissonSetMultimapCache.java index 316f633ed..0ac030794 100644 --- a/redisson/src/main/java/org/redisson/RedissonSetMultimapCache.java +++ b/redisson/src/main/java/org/redisson/RedissonSetMultimapCache.java @@ -45,9 +45,6 @@ public class RedissonSetMultimapCache extends RedissonSetMultimap im public RedissonSetMultimapCache(EvictionScheduler evictionScheduler, Codec codec, CommandAsyncExecutor connectionManager, String name) { super(codec, connectionManager, name); - if (evictionScheduler != null) { - evictionScheduler.scheduleCleanMultimap(name, getTimeoutSetName()); - } baseCache = new RedissonMultimapCache<>(connectionManager, evictionScheduler, this, getTimeoutSetName(), prefix); } diff --git a/redisson/src/main/java/org/redisson/api/RListMultimapCache.java b/redisson/src/main/java/org/redisson/api/RListMultimapCache.java index f5584d749..bfde40621 100644 --- a/redisson/src/main/java/org/redisson/api/RListMultimapCache.java +++ b/redisson/src/main/java/org/redisson/api/RListMultimapCache.java @@ -23,6 +23,6 @@ package org.redisson.api; * @param key * @param value */ -public interface RListMultimapCache extends RListMultimap, RMultimapCache { +public interface RListMultimapCache extends RListMultimap, RMultimapCache, RDestroyable { } diff --git a/redisson/src/main/java/org/redisson/api/RMultimapCache.java b/redisson/src/main/java/org/redisson/api/RMultimapCache.java index 292583d58..e55b524f4 100644 --- a/redisson/src/main/java/org/redisson/api/RMultimapCache.java +++ b/redisson/src/main/java/org/redisson/api/RMultimapCache.java @@ -25,7 +25,7 @@ import java.util.concurrent.TimeUnit; * @param key type * @param value type */ -public interface RMultimapCache extends RMultimap, RMultimapCacheAsync, RDestroyable { +public interface RMultimapCache extends RMultimap, RMultimapCacheAsync { /** * Set a timeout for key. After the timeout has expired, diff --git a/redisson/src/main/java/org/redisson/api/RSetMultimapCache.java b/redisson/src/main/java/org/redisson/api/RSetMultimapCache.java index b3f641530..9f3d2dd3d 100644 --- a/redisson/src/main/java/org/redisson/api/RSetMultimapCache.java +++ b/redisson/src/main/java/org/redisson/api/RSetMultimapCache.java @@ -22,6 +22,6 @@ package org.redisson.api; * @param key type * @param value type */ -public interface RSetMultimapCache extends RSetMultimap, RMultimapCache { +public interface RSetMultimapCache extends RSetMultimap, RMultimapCache, RDestroyable { }