Fix bug in case a value was GC

hernanwilkinson · Aug 25, 2019 · 81c77de · 81c77de
1 parent ff9bf69
commit 81c77de
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/src/Collections-Tests/WeakValueDictionaryTest.class.st b/src/Collections-Tests/WeakValueDictionaryTest.class.st
@@ -141,6 +141,16 @@ WeakValueDictionaryTest >> testRehashDoesNotTransformAssociations [
 	self assert: (d privateAssociations anyOne isKindOf: WeakValueAssociation)
 ]
 
+{ #category : #'tests - size capacity' }
+WeakValueDictionaryTest >> testSize [
+	| d |
+	d := self classToBeTested new.
+	self assert: d size equals: 0.
+	d at: 1 put: 2.
+	d at: 2 put: nil.
+	self assert: d size equals: 2
+]
+
 { #category : #tests }
 WeakValueDictionaryTest >> testSizeWithGarbageCollectedValue [
 

diff --git a/src/Collections-Weak/WeakValueDictionary.class.st b/src/Collections-Weak/WeakValueDictionary.class.st
@@ -65,7 +65,7 @@ WeakValueDictionary >> at: key put: anObject [
 WeakValueDictionary >> rehash [
 	| newSelf |
 	newSelf := self species new: self size.
-	array do: [ :each | each ifNotNil: [ :asso | newSelf noCheckAdd: asso ] ].
+	array do: [ :each | each value ifNotNil: [ :asso | newSelf noCheckAdd: asso ] ].
 	array := newSelf array
 ]