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 86aceb5cfa Align with later versions
86aceb5cfa is described below
commit 86aceb5cfa74e6966ca2b90f95fe1580c1bbb20d
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Fri Feb 21 18:03:22 2025 +0000
Align with later versions
---
java/org/apache/tomcat/util/compat/Jre12Compat.java | 1 -
java/org/apache/tomcat/util/compat/LocalStrings.properties | 2 +-
2 files changed, 1 insertion(+), 2 deletions(-)
diff --git a/java/org/apache/tomcat/util/compat/Jre12Compat.java
b/java/org/apache/tomcat/util/compat/Jre12Compat.java
index 640f393019..45080aff45 100644
--- a/java/org/apache/tomcat/util/compat/Jre12Compat.java
+++ b/java/org/apache/tomcat/util/compat/Jre12Compat.java
@@ -43,7 +43,6 @@ public class Jre12Compat extends Jre9Compat {
Class<?> c1 = null;
try {
c1 = Class.forName("java.text.CompactNumberFormat");
-
} catch (ReflectiveOperationException e) {
// Must be pre-Java 12
log.debug(sm.getString("jre12Compat.javaPre12"), e);
diff --git a/java/org/apache/tomcat/util/compat/LocalStrings.properties
b/java/org/apache/tomcat/util/compat/LocalStrings.properties
index 3f95bb4bdf..56370ab9cf 100644
--- a/java/org/apache/tomcat/util/compat/LocalStrings.properties
+++ b/java/org/apache/tomcat/util/compat/LocalStrings.properties
@@ -42,4 +42,4 @@ jreCompat.noVirtualThreads=Java Runtime does not support
virtual threads. You mu
jreCompat.useCanonCaches.failed=Failed to set the
java.io.FileSystem.useCanonCaches static field
jreCompat.useCanonCaches.init=Unable to create a reference to the
java.io.FileSystem.useCanonCaches static field
jreCompat.useCanonCaches.java18=If using Java 18 to Java 20 inclusive, you
must not enabled the canonical file name cache using
-Dsun.io.useCanonCaches=true on the command line as Tomcat is unable to disable
the cache via reflection on those Java versions
-jreCompat.useCanonCaches.none=No reference to the
java.io.FileSystem.useCanonCaches static field available.
+jreCompat.useCanonCaches.none=No reference to the
java.io.FileSystem.useCanonCaches static field available
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
