diff --git a/src/main/java/org/mockito/internal/stubbing/StubbedInvocationMatcher.java b/src/main/java/org/mockito/internal/stubbing/StubbedInvocationMatcher.java index 441a4d0e03..7153446dc5 100644 --- a/src/main/java/org/mockito/internal/stubbing/StubbedInvocationMatcher.java +++ b/src/main/java/org/mockito/internal/stubbing/StubbedInvocationMatcher.java @@ -22,6 +22,7 @@ public class StubbedInvocationMatcher extends InvocationMatcher implements Seria private static final long serialVersionUID = 4919105134123672727L; private final Queue answers = new ConcurrentLinkedQueue(); private final Strictness strictness; + private final Object usedAtLock = new Object[0]; private DescribedInvocation usedAt; public StubbedInvocationMatcher( @@ -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