Merge pull request #27766 from vespa-engine/jdk21-prep-2

Jdk21 prep 2

2 files changed, 5 insertions, 8 deletions

diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/session/PrepareParamsTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/session/PrepareParamsTest.java
index 2c898b8bf7d..342ea7b2297 100644
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/session/PrepareParamsTest.java
+++ b/configserver/src/test/java/com/yahoo/vespa/config/server/session/PrepareParamsTest.java
@@ -9,9 +9,7 @@ import com.yahoo.config.provision.ApplicationId;
 import com.yahoo.config.provision.CloudAccount;
 import com.yahoo.config.provision.TenantName;
 import com.yahoo.container.jdisc.HttpRequest;
-
 import com.yahoo.security.X509CertificateUtils;
-
 import com.yahoo.slime.Cursor;
 import com.yahoo.slime.Injector;
 import com.yahoo.slime.ObjectInserter;
@@ -29,7 +27,6 @@ import java.security.cert.X509Certificate;
 import java.time.Duration;
 import java.util.List;
 import java.util.OptionalInt;
-;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
diff --git a/vespa-osgi-testrunner/src/main/java/com/yahoo/vespa/testrunner/TestReport.java b/vespa-osgi-testrunner/src/main/java/com/yahoo/vespa/testrunner/TestReport.java
index 1641bd7802f..a2ac86309d9 100644
--- a/vespa-osgi-testrunner/src/main/java/com/yahoo/vespa/testrunner/TestReport.java
+++ b/vespa-osgi-testrunner/src/main/java/com/yahoo/vespa/testrunner/TestReport.java
@@ -336,15 +336,15 @@ public class TestReport {
 
         StackTraceElement[] stack = thrown.getStackTrace();
         int i = 0;
-        int previousNativeFrame = -1;
+        int firstReflectFrame = -1;
         int cutoff = 0;
         boolean rootedInTestFramework = false;
         while (++i < stack.length) {
             rootedInTestFramework |= testFrameworkRootClass.equals(stack[i].getClassName());
-            if (stack[i].isNativeMethod())
-                previousNativeFrame = i; // Native method invokes the first user test frame.
-            if (rootedInTestFramework && previousNativeFrame > 0) {
-                cutoff = previousNativeFrame;
+            if (firstReflectFrame == -1 && stack[i].getClassName().startsWith("jdk.internal.reflect."))
+                firstReflectFrame = i; // jdk.internal.reflect class invokes the first user test frame, on both jdk 17 and 21.
+            if (rootedInTestFramework && firstReflectFrame > 0) {
+                cutoff = firstReflectFrame;
                 break;
             }
             boolean isDynamicTestInvocation = "org.junit.jupiter.engine.descriptor.DynamicTestTestDescriptor".equals(stack[i].getClassName());