Fixes #2389 : Parallel use of mocks with deep stubbing may lead to ConcurrentModificationException #2444
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #2389 "Parallel use of mocks with deep stubbing may lead to ConcurrentModificationException"
The issue was that ReturnsDeepStubs (line 82) retrieved the existings stubbings via
InvocationContainerImpl::getStubbingsDescending
, and iterating on it to find existing stubbings resulted in aConcurrentModificationException
because other threads were adding their ownAnswer
to the stubbings list (InvocationContainerImpl::addAnswer
called atReturnsDeepStubs
line 150).All of the methods in
InvocationContainerImpl
that mutate theLinkedList<StubbedInvocationMatcher> stubbed
field are synchronized onstubbed
, but the getters aren't (getStubbingsAscending
andgetStubbingsDescending
). I added aInvocationMatcherImpl::findStubbedAnswer
that does basically whatReturnsDeepStubs
used to do, but synchronizing onstubbed
.Somebody had been there before and had noticed there was something weird, because there was a TODO in the code:
However, I tried that in my original solution (using
findAnswerFor()
), but it didn't work because it used thematches()
method from the elements ofstubbed
, which don't have the matchers fromverify()
(see test and debugger screenshots below).I also added a test for regressions.
EDIT: described new solution