diff --git a/test-instrumenter/src/org/jetbrains/kotlin/testFramework/MockApplicationCreationTracingInstrumenter.kt b/test-instrumenter/src/org/jetbrains/kotlin/testFramework/MockApplicationCreationTracingInstrumenter.kt index f4be6bbb964..39671629585 100644 --- a/test-instrumenter/src/org/jetbrains/kotlin/testFramework/MockApplicationCreationTracingInstrumenter.kt +++ b/test-instrumenter/src/org/jetbrains/kotlin/testFramework/MockApplicationCreationTracingInstrumenter.kt @@ -46,12 +46,14 @@ class MockApplicationCreationTracingInstrumenter(private val debugInfo: Boolean) loader.getResource("org/jetbrains/kotlin/testFramework/MockComponentManagerCreationTracer.class") != null override fun transform( - loader: ClassLoader, - className: String, + loader: ClassLoader?, + className: String?, classBeingRedefined: Class<*>?, - protectionDomain: ProtectionDomain, + protectionDomain: ProtectionDomain?, classfileBuffer: ByteArray ): ByteArray? { + if (className == null || loader == null) return null + if (loader::class.java.name == "org.jetbrains.kotlin.preloading.MemoryBasedClassLoader") return null if (className == "com/intellij/mock/MockComponentManager" && isMockComponentManagerCreationTracerCanBeLoaded(loader)) {