This is an automated email from the ASF dual-hosted git repository. rmaucher pushed a commit to branch 9.0.x in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 06e2daaa198782d45b5c0f35591bea6bd983c74a Author: remm <[email protected]> AuthorDate: Fri Oct 16 18:15:56 2026 +0200 Java compatibility --- java/org/apache/tomcat/util/net/openssl/OpenSSLEngine.java | 2 +- java/org/apache/tomcat/util/scan/JarFileUrlJar.java | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/java/org/apache/tomcat/util/net/openssl/OpenSSLEngine.java b/java/org/apache/tomcat/util/net/openssl/OpenSSLEngine.java index 2ec5c8a894..46b106f76d 100644 --- a/java/org/apache/tomcat/util/net/openssl/OpenSSLEngine.java +++ b/java/org/apache/tomcat/util/net/openssl/OpenSSLEngine.java @@ -894,7 +894,7 @@ public final class OpenSSLEngine extends SSLEngine implements SSLUtil.ProtocolIn SSL.setOptionsLong(ssl, SSL.SSL_OP_NO_TLSv1_2); } if (!tlsv1_3) { - SSL.setOptionsLong(state.ssl, SSL.SSL_OP_NO_TLSv1_3); + SSL.setOptionsLong(ssl, SSL.SSL_OP_NO_TLSv1_3); } } diff --git a/java/org/apache/tomcat/util/scan/JarFileUrlJar.java b/java/org/apache/tomcat/util/scan/JarFileUrlJar.java index dfe1d01d15..0b5b8af5b8 100644 --- a/java/org/apache/tomcat/util/scan/JarFileUrlJar.java +++ b/java/org/apache/tomcat/util/scan/JarFileUrlJar.java @@ -248,7 +248,7 @@ public class JarFileUrlJar implements Jar { * @return the map of 'base' name to the entry to use for that name */ private Map<String,JarEntry> populateMultiReleaseMap() { - int targetVersion = Runtime.version().feature(); + int targetVersion = JreCompat.getInstance().jarFileRuntimeMajorVersion(); Map<String,Integer> mrVersions = new HashMap<>(); Map<String,JarEntry> result = new HashMap<>(); @@ -265,7 +265,9 @@ public class JarFileUrlJar implements Jar { String baseName = name.substring(i + 1); int version; try { - version = Integer.parseInt(name, 18, i, 10); + // Note: the Integer.parseInt(CharSequence,int,int,int) + // overload is not available on Java 8 + version = Integer.parseInt(name.substring(18, i)); } catch (NumberFormatException e) { continue; } --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
