Fix nullability in the instrumenter, avoid exceptions on tests setup

JetBrains · Jul 15, 2019 · 2ef575d · 2ef575d
1 parent 4caddd2
commit 2ef575d
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/...nter/src/org/jetbrains/kotlin/testFramework/MockApplicationCreationTracingInstrumenter.kt b/...nter/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)) {