Use less granular lock on class creation to avoid dead-lock on recurs…

…ive types
mockito · Jan 23, 2017 · b11d341 · b11d341
1 parent b4dcfdb
commit b11d341
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 12 deletions.
diff --git a/build.gradle b/build.gradle
@@ -45,8 +45,8 @@ apply from: 'gradle/root/version.gradle'
 apply from: "gradle/java-library.gradle"
 
 dependencies {
-    compile 'net.bytebuddy:byte-buddy:1.6.4'
-    compile 'net.bytebuddy:byte-buddy-agent:1.6.4'
+    compile 'net.bytebuddy:byte-buddy:1.6.5'
+    compile 'net.bytebuddy:byte-buddy-agent:1.6.5'
 
     provided "junit:junit:4.12", "org.hamcrest:hamcrest-core:1.3"
     compile "org.objenesis:objenesis:2.5"

diff --git a/src/main/java/org/mockito/internal/creation/bytebuddy/TypeCachingBytecodeGenerator.java b/src/main/java/org/mockito/internal/creation/bytebuddy/TypeCachingBytecodeGenerator.java
@@ -13,6 +13,8 @@
 
 class TypeCachingBytecodeGenerator extends ReferenceQueue<ClassLoader> implements BytecodeGenerator {
 
+    private final Object BOOTSTRAP_LOCK = new Object();
+
     private final BytecodeGenerator bytecodeGenerator;
 
     private final TypeCache<SerializationFeatureKey> typeCache;
@@ -26,15 +28,15 @@ public TypeCachingBytecodeGenerator(BytecodeGenerator bytecodeGenerator, boolean
     @Override
     public <T> Class<T> mockClass(final MockFeatures<T> params) {
         try {
-
-        return (Class<T>) typeCache.findOrInsert(params.mockedType.getClassLoader(),
-                new SerializationFeatureKey(params.mockedType, params.interfaces, params.serializableMode),
-                new Callable<Class<?>>() {
-                    @Override
-                    public Class<?> call() throws Exception {
-                        return bytecodeGenerator.mockClass(params);
-                    }
-                }, params.mockedType);
+            ClassLoader classLoader = params.mockedType.getClassLoader();
+            return (Class<T>) typeCache.findOrInsert(classLoader,
+                    new SerializationFeatureKey(params.mockedType, params.interfaces, params.serializableMode),
+                    new Callable<Class<?>>() {
+                        @Override
+                        public Class<?> call() throws Exception {
+                            return bytecodeGenerator.mockClass(params);
+                        }
+                    }, classLoader == null ? BOOTSTRAP_LOCK : classLoader);
         } catch (IllegalArgumentException exception) {
             Throwable cause = exception.getCause();
             if (cause instanceof RuntimeException) {

diff --git a/subprojects/android/android.gradle b/subprojects/android/android.gradle
@@ -11,7 +11,7 @@ apply from: "$rootDir/gradle/java-library.gradle"
 
 dependencies {
     compile project.rootProject
-    compile "net.bytebuddy:byte-buddy-android:1.6.4"
+    compile "net.bytebuddy:byte-buddy-android:1.6.5"
 }
 
 apply from: "$rootDir/gradle/publishable-java-library.gradle"