You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2021/07/28 20:34:07 UTC
[tomcat] branch 8.5.x updated: Remove Java 7 references
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 b46d966 Remove Java 7 references
b46d966 is described below
commit b46d966352d9b54fbe4f6d73d791e73ca9331391
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Wed Jul 28 21:32:10 2021 +0100
Remove Java 7 references
---
java/org/apache/tomcat/jni/Library.java | 6 +-----
java/org/apache/tomcat/util/net/SSLUtilBase.java | 3 +--
2 files changed, 2 insertions(+), 7 deletions(-)
diff --git a/java/org/apache/tomcat/jni/Library.java b/java/org/apache/tomcat/jni/Library.java
index ef00fb9..8e4f40c 100644
--- a/java/org/apache/tomcat/jni/Library.java
+++ b/java/org/apache/tomcat/jni/Library.java
@@ -40,11 +40,7 @@ public final class Library {
try {
System.loadLibrary(NAMES[i]);
loaded = true;
- } catch (ThreadDeath t) {
- throw t;
- } catch (VirtualMachineError t) {
- // Don't use a Java 7 multiple exception catch so we can keep
- // the JNI code identical between Tomcat 6/7/8/9
+ } catch (ThreadDeath | VirtualMachineError t) {
throw t;
} catch (Throwable t) {
String name = System.mapLibraryName(NAMES[i]);
diff --git a/java/org/apache/tomcat/util/net/SSLUtilBase.java b/java/org/apache/tomcat/util/net/SSLUtilBase.java
index 7c4896f..de9ba71 100644
--- a/java/org/apache/tomcat/util/net/SSLUtilBase.java
+++ b/java/org/apache/tomcat/util/net/SSLUtilBase.java
@@ -200,8 +200,7 @@ public abstract class SSLUtilBase implements SSLUtil {
// Unfortunately, some key stores behave differently with null
// and "".
// JKS key stores treat null and "" interchangeably.
- // PKCS12 key stores (Java 7 onwards) don't return the cert if
- // null is used.
+ // PKCS12 key stores don't return the cert if null is used.
// Key stores that do not use passwords expect null
// Therefore:
// - generally use null if pass is null or ""
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org