Fixed - RBatch throws NoSuchElementException. #2212

6 years ago · ac6581ed21
parent 06d155f2c8
commit ac6581ed21
1 changed files with 7 additions and 1 deletions
--- 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();
+                                    if (resultIter.hasNext()) {
                                        promise.trySuccess(resultIter.next());
+                                    } else {
+                                        // fix for https://github.com/redisson/redisson/issues/2212
+                                        promise.trySuccess(null);
+                                    }
                                }
                            }