Infinity loop with iterator fixed. #515

9 years ago · 645b1240dc
parent f8dfdb7154
commit 645b1240dc
1 changed files with 12 additions and 6 deletions
--- a/src/main/java/org/redisson/RedissonBaseIterator.java
+++ b/src/main/java/org/redisson/RedissonBaseIterator.java
@ -73,13 +73,19 @@ abstract class RedissonBaseIterator<V> implements Iterator<V> {
                    if (firstValues.isEmpty()) {
                        firstValues = lastValues;
                        lastValues = null;
-                        if (firstValues.isEmpty() && tryAgain()) {
+                        if (firstValues.isEmpty()) {
+                            if (tryAgain()) {
                                client = null;
                                firstValues = null;
                                nextIterPos = 0;
                                prevIterPos = -1;
                                continue;
                            }
+                            if (res.getPos() == 0) {
+                                finished = true;
+                                return false;
+                            }
+                        }
                    } else if (lastValues.removeAll(firstValues)) {
                        currentElementRemoved = false;
                        removeExecuted = false;