Fetch handle in _RealmResultsIterator.current lazily (it may never be…

… called for a given index)
realm · Aug 31, 2023 · 29ff9f1 · 29ff9f1
1 parent 6abe028
commit 29ff9f1
Showing 1 changed file with 2 additions and 4 deletions.
diff --git a/lib/src/results.dart b/lib/src/results.dart
@@ -216,18 +216,16 @@ class _RealmResultsIterator<T extends Object?> implements Iterator<T> {
         _index = -1;
 
   @override
-  T get current => _current as T;
+  T get current => _current ??= _results[_index];
 
   @override
   bool moveNext() {
     int length = _results.length;
+    _current = null;
     _index++;
     if (_index >= length) {
-      _current = null;
       return false;
     }
-    _current = _results[_index];
-
     return true;
   }
 }