From cfd65a932e753525d5ee641ddd2e919f7645bae3 Mon Sep 17 00:00:00 2001
From: Nikita Koksharov <nkoksharov@redisson.pro>
Date: Tue, 10 Aug 2021 09:46:54 +0300
Subject: [PATCH] MapLoader check in RMap.loadAll methods.

---
 redisson/src/main/java/org/redisson/RedissonMap.java | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/redisson/src/main/java/org/redisson/RedissonMap.java b/redisson/src/main/java/org/redisson/RedissonMap.java
index 4188271e9..581a53333 100644
--- a/redisson/src/main/java/org/redisson/RedissonMap.java
+++ b/redisson/src/main/java/org/redisson/RedissonMap.java
@@ -1200,6 +1200,10 @@ public class RedissonMap<K, V> extends RedissonExpirable implements RMap<K, V> {
     
     @Override
     public RFuture<Void> loadAllAsync(boolean replaceExistingValues, int parallelism) {
+        if (options.getLoader() == null) {
+            throw new NullPointerException("MapLoader isn't defined");
+        }
+
         Iterable<K> keys;
         try {
             keys = options.getLoader().loadAllKeys();
@@ -1217,10 +1221,14 @@ public class RedissonMap<K, V> extends RedissonExpirable implements RMap<K, V> {
     
     @Override
     public RFuture<Void> loadAllAsync(Set<? extends K> keys, boolean replaceExistingValues, int parallelism) {
-        return loadAllAsync((Iterable<K>) keys, replaceExistingValues, parallelism, null);
+        return loadAllAsync(keys, replaceExistingValues, parallelism, null);
     }
     
     protected RFuture<Void> loadAllAsync(Iterable<? extends K> keys, boolean replaceExistingValues, int parallelism, Map<K, V> loadedEntires) {
+        if (options.getLoader() == null) {
+            throw new NullPointerException("MapLoader isn't defined");
+        }
+
         if (parallelism < 1) {
             throw new IllegalArgumentException("parallelism can't be lower than 1");
         }
-- 
GitLab