Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix thread race condition #2248

Merged
merged 2 commits into from Apr 5, 2021
Merged

Fix thread race condition #2248

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
29385ed
Fix thread race condition
TimvdLippe Mar 31, 2021
d7b8bde
Fix serialization issue
TimvdLippe Mar 31, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
9 changes: 7 additions & 2 deletions src/main/java/org/mockito/internal/stubbing/StubbedInvocationMatcher.java
View file
Open in desktop
Expand Up @@ -22,6 +22,7 @@ public class StubbedInvocationMatcher extends InvocationMatcher implements Seria
private static final long serialVersionUID = 4919105134123672727L;
private final Queue<Answer> answers = new ConcurrentLinkedQueue<Answer>();
private final Strictness strictness;
private final Object usedAtLock = new Object[0];
private DescribedInvocation usedAt;

public StubbedInvocationMatcher(
Expand All @@ -45,11 +46,15 @@ public void addAnswer(Answer answer) {
}

public void markStubUsed(DescribedInvocation usedAt) {
this.usedAt = usedAt;
synchronized (usedAtLock) {
this.usedAt = usedAt;
}
}

public boolean wasUsed() {
return usedAt != null;
synchronized (usedAtLock) {
return usedAt != null;
}
}

@Override
Expand Down