Merge pull request #612 from ApptiveGrid/SoilIndexIterator-next-avoid…

…-association
ApptiveGrid · Feb 13, 2024 · daf0c2d · daf0c2d
2 parents 521383f + 4e17d89
commit daf0c2d
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/src/Soil-Core/SoilIndexIterator.class.st b/src/Soil-Core/SoilIndexIterator.class.st
@@ -250,7 +250,12 @@ SoilIndexIterator >> lastPage [
 
 { #category : #accessing }
 SoilIndexIterator >> next [
-	^ self nextAssociation value
+	| nextAssociation nextValue |
+	nextAssociation := self basicNextAssociation ifNil: [ ^nil ].
+	nextValue := (self
+ 			restoreValue: nextAssociation value
+ 			forKey: nextAssociation key).
+	^ nextValue ifNil: [ self next ]
 ]
 
 { #category : #accessing }
@@ -266,7 +271,8 @@ SoilIndexIterator >> next: anInteger [
 
 { #category : #accessing }
 SoilIndexIterator >> nextAfter: key [
-	^ (self nextAssociationAfter: key) value
+	self find: key.
+	^ self next
 ]
 
 { #category : #accessing }