Skip to content

Commit 17706c6

Browse files
authored
Workaround for JDK-8231454 on Java 11 is no longer necessary as of 11.0.17 (#600)
1 parent a408563 commit 17706c6

File tree

1 file changed

+5
-3
lines changed

1 file changed

+5
-3
lines changed

src/main/java/org/jenkinsci/plugins/workflow/cps/CpsFlowExecution.java

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@
5252
import hudson.model.Action;
5353
import hudson.model.Result;
5454
import hudson.util.Iterators;
55+
import hudson.util.VersionNumber;
5556
import io.jenkins.lib.versionnumber.JavaSpecificationVersion;
5657
import jenkins.model.CauseOfInterruption;
5758
import jenkins.model.Jenkins;
@@ -1390,9 +1391,10 @@ private static void cleanUpGlobalClassValue(@NonNull ClassLoader loader) throws
13901391
}
13911392

13921393
private static void cleanUpClassInfoCache(Class<?> clazz) {
1393-
JavaSpecificationVersion current = JavaSpecificationVersion.forCurrentJVM();
1394-
if (current.isNewerThan(new JavaSpecificationVersion("1.8"))
1395-
&& current.isOlderThan(new JavaSpecificationVersion("16"))) {
1394+
int releaseVersion = JavaSpecificationVersion.forCurrentJVM().toReleaseVersion();
1395+
if ((releaseVersion > 8 && releaseVersion < 11)
1396+
|| (releaseVersion == 11 && new VersionNumber(System.getProperty("java.version")).isOlderThan(new VersionNumber("11.0.17")))
1397+
|| (releaseVersion > 11 && releaseVersion < 16)) {
13961398
try {
13971399
// TODO Work around JDK-8231454.
13981400
Class<?> classInfoC = Class.forName("com.sun.beans.introspect.ClassInfo");

0 commit comments

Comments
 (0)