From ac6581ed21d111d27dfbe41b1662d742df3d0c43 Mon Sep 17 00:00:00 2001
From: Nikita Koksharov <nkoksharov@redisson.pro>
Date: Sat, 3 Aug 2019 10:37:06 +0300
Subject: [PATCH] Fixed - RBatch throws NoSuchElementException. #2212

---
 .../java/org/redisson/command/CommandBatchService.java    | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/redisson/src/main/java/org/redisson/command/CommandBatchService.java b/redisson/src/main/java/org/redisson/command/CommandBatchService.java
index 7e473dfeb..d2e90f4a7 100644
--- a/redisson/src/main/java/org/redisson/command/CommandBatchService.java
+++ b/redisson/src/main/java/org/redisson/command/CommandBatchService.java
@@ -468,8 +468,14 @@ public class CommandBatchService extends CommandAsyncService {
                                     if (data.getCommand().getName().equals(RedisCommands.EXEC.getName())) {
                                         break;
                                     }
+                                    
                                     RPromise<Object> promise = (RPromise<Object>) data.getPromise();
-                                    promise.trySuccess(resultIter.next());
+                                    if (resultIter.hasNext()) {
+                                        promise.trySuccess(resultIter.next());
+                                    } else {
+                                        // fix for https://github.com/redisson/redisson/issues/2212
+                                        promise.trySuccess(null);
+                                    }
                                 }
                             }