This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch 9.0.x in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/9.0.x by this push: new 6eace6d86d Align with 10.1.x 6eace6d86d is described below commit 6eace6d86d5d7233708f0099835f9571b82c009b Author: Mark Thomas <ma...@apache.org> AuthorDate: Tue Jan 17 12:56:54 2023 +0000 Align with 10.1.x --- java/org/apache/tomcat/util/compat/JreCompat.java | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/java/org/apache/tomcat/util/compat/JreCompat.java b/java/org/apache/tomcat/util/compat/JreCompat.java index 7c9c8ccffa..d468589002 100644 --- a/java/org/apache/tomcat/util/compat/JreCompat.java +++ b/java/org/apache/tomcat/util/compat/JreCompat.java @@ -46,10 +46,10 @@ public class JreCompat { private static final JreCompat instance; private static final boolean graalAvailable; - private static final boolean jre19Available; - private static final boolean jre16Available; - private static final boolean jre11Available; private static final boolean jre9Available; + private static final boolean jre11Available; + private static final boolean jre16Available; + private static final boolean jre19Available; private static final StringManager sm = StringManager.getManager(JreCompat.class); protected static final Method setApplicationProtocolsMethod; @@ -71,24 +71,24 @@ public class JreCompat { // Look for the highest supported JVM first if (Jre19Compat.isSupported()) { instance = new Jre19Compat(); - jre9Available = true; - jre16Available = true; jre19Available = true; + jre16Available = true; + jre9Available = true; } else if (Jre16Compat.isSupported()) { instance = new Jre16Compat(); - jre9Available = true; - jre16Available = true; jre19Available = false; + jre16Available = true; + jre9Available = true; } else if (Jre9Compat.isSupported()) { instance = new Jre9Compat(); - jre9Available = true; - jre16Available = false; jre19Available = false; + jre16Available = false; + jre9Available = true; } else { instance = new JreCompat(); - jre9Available = false; - jre16Available = false; jre19Available = false; + jre16Available = false; + jre9Available = false; } jre11Available = instance.jarFileRuntimeMajorVersion() >= 11; @@ -139,6 +139,7 @@ public class JreCompat { return jre19Available; } + // Java 8 implementation of Java 9 methods /** --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org