From 78bc8e3383a071abd5a09065354d527a90857cd1 Mon Sep 17 00:00:00 2001
From: Adel El-Beik <48713346+adelel1@users.noreply.github.com>
Date: Tue, 4 Jun 2024 17:55:15 +0100
Subject: [PATCH] ENT-11343: Dont instrument files starting with jdk as well
 now. (#7741)

* ENT-11343: Dont instrument files starting with jdk as well now.

* ENT-11343: Keep detekt happy.
---
 tools/checkpoint-agent/build.gradle                           | 2 +-
 .../src/main/kotlin/net/corda/tools/CheckpointAgent.kt        | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/tools/checkpoint-agent/build.gradle b/tools/checkpoint-agent/build.gradle
index 442f63eea8..d32317db49 100644
--- a/tools/checkpoint-agent/build.gradle
+++ b/tools/checkpoint-agent/build.gradle
@@ -6,7 +6,7 @@ description 'A javaagent to allow hooking into Kryo checkpoints'
 
 dependencies {
     compileOnly "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"
-    compileOnly "org.javassist:javassist:$javaassist_version"
+    implementation "org.javassist:javassist:$javaassist_version"
     compileOnly "com.esotericsoftware:kryo:$kryo_version"
     compileOnly "co.paralleluniverse:quasar-core:$quasar_version"
 
diff --git a/tools/checkpoint-agent/src/main/kotlin/net/corda/tools/CheckpointAgent.kt b/tools/checkpoint-agent/src/main/kotlin/net/corda/tools/CheckpointAgent.kt
index ce186dacc4..1207e1504c 100644
--- a/tools/checkpoint-agent/src/main/kotlin/net/corda/tools/CheckpointAgent.kt
+++ b/tools/checkpoint-agent/src/main/kotlin/net/corda/tools/CheckpointAgent.kt
@@ -127,7 +127,9 @@ object CheckpointHook : ClassFileTransformer {
             protectionDomain: ProtectionDomain?,
             classfileBuffer: ByteArray
     ): ByteArray? {
-        if (className.startsWith("java") || className.startsWith("javassist") || className.startsWith("kotlin")) {
+        @Suppress("ComplexCondition")
+        if (className.startsWith("java") || className.startsWith("javassist") || className.startsWith("kotlin")
+                || className.startsWith("jdk")) {
             return null
         }
         return try {