Fix TypeCache dead lock #902
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
TimvdLippe
reviewed
Jan 23, 2017
|
@raphw Could that be the issue that I saw in #897, see travis log : https://travis-ci.org/mockito/mockito/jobs/194254780#L360-L366 |
bric3
approved these changes
Jan 23, 2017
|
No, that is a flaky test as we rely on triggering a garbage collection which is something we do not controll on a VM even though there is a good chance to. We should ideally rerun this test multiple times upon a failure. @TimvdLippe I fixed the accidental pre-commit. |
|
OK. Agreed. |
mockitoguy
reviewed
Jan 24, 2017
| @@ -13,6 +13,8 @@ | |||
|
|
|||
| class TypeCachingBytecodeGenerator extends ReferenceQueue<ClassLoader> implements BytecodeGenerator { | |||
|
|
|||
| private final Object BOOTSTRAP_LOCK = new Object(); | |||
There was a problem hiding this comment.
Is this field intended to be constant? If not, it should have lower case name.
There was a problem hiding this comment.
It is true, this should be lower case but yes, it should be an instance constant.
There was a problem hiding this comment.
However this lock should not be static.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
I could trace the problem to more eager resolution of types in Java u31 upon loading where concurrent mock creation with locking on the class level causes a dead lock. This can happen in other VM implementations but can be solved with a more granular lock on our type cache.
This fixes #892.