Merge pull request #782 from hoisie/javax-lookup

Avoid Lookup strategy when constructing javax classes
mockk · Jan 24, 2022 · 61adb51 · 61adb51
2 parents 6d20a71 + 712952c
commit 61adb51
Showing 1 changed file with 2 additions and 3 deletions.
diff --git a/agent/jvm/src/main/java/io/mockk/proxy/jvm/ClassLoadingStrategyChooser.java b/agent/jvm/src/main/java/io/mockk/proxy/jvm/ClassLoadingStrategyChooser.java
@@ -33,10 +33,9 @@ public static <T> ClassLoadingStrategy<ClassLoader> chooseClassLoadingStrategy(C
         try {
             final ClassLoadingStrategy<ClassLoader> strategy;
             if (!type.getName().startsWith("java.") &&
+                !type.getName().startsWith("javax.") &&
                     ClassInjector.UsingLookup.isAvailable() &&
-                    // based on https://github.com/jmock-developers/jmock-library/issues/127
-                    type.getClassLoader() == ClassLoadingStrategyChooser.class.getClassLoader()
-                && PRIVATE_LOOKUP_IN != null && LOOKUP != null) {
+                PRIVATE_LOOKUP_IN != null && LOOKUP != null) {
                 Object privateLookup = PRIVATE_LOOKUP_IN.invoke(null, type, LOOKUP);
                 strategy = ClassLoadingStrategy.UsingLookup.of(privateLookup);
             } else if (ClassInjector.UsingReflection.isAvailable()) {