This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/8.5.x by this push:
new 272519d38d Align with 9.0.x
272519d38d is described below
commit 272519d38d409a017855399f1506cc30fa067b30
Author: Mark Thomas <[email protected]>
AuthorDate: Tue Jan 17 12:57:04 2023 +0000
Align with 9.0.x
---
java/org/apache/tomcat/util/compat/JreCompat.java | 35 +++++++++++------------
1 file changed, 16 insertions(+), 19 deletions(-)
diff --git a/java/org/apache/tomcat/util/compat/JreCompat.java
b/java/org/apache/tomcat/util/compat/JreCompat.java
index 87fd07f5e1..13b30b23ea 100644
--- a/java/org/apache/tomcat/util/compat/JreCompat.java
+++ b/java/org/apache/tomcat/util/compat/JreCompat.java
@@ -39,21 +39,20 @@ import org.apache.tomcat.util.res.StringManager;
*/
public class JreCompat {
- private static final StringManager sm =
StringManager.getManager(JreCompat.class);
-
private static final int RUNTIME_MAJOR_VERSION = 7;
private static final JreCompat instance;
- private static final boolean jre19Available;
- private static final boolean jre16Available;
- private static final boolean jre11Available;
- private static final boolean jre9Available;
private static final boolean jre8Available;
+ 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);
+
static {
// This is Tomcat 8 with a minimum Java version of Java 7.
- // Compatibility code exists for Java 8, 9, 11 & 19
// Look for the highest supported JVM first
if (Jre19Compat.isSupported()) {
instance = new Jre19Compat();
@@ -110,11 +109,21 @@ public class JreCompat {
}
+ public static boolean isJre11Available() {
+ return jre11Available;
+ }
+
+
public static boolean isJre16Available() {
return jre16Available;
}
+ public static boolean isJre19Available() {
+ return jre19Available;
+ }
+
+
// Java 7 implementation of Java 8 methods
@SuppressWarnings("unused")
@@ -291,20 +300,8 @@ public class JreCompat {
}
- // Java 7 implementations of Java 11 methods
-
- public static boolean isJre11Available() {
- return jre11Available;
- }
-
-
// Java 7 implementations of Java 19 methods
- public static boolean isJre19Available() {
- return jre19Available;
- }
-
-
/**
* Obtains the executor, if any, used to create the provided thread.
*
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
