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 006ee1b Remove Java 7 references 006ee1b is described below commit 006ee1b05ba231c6a76aff59e81b25b1588b3561 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 | 12 ++---------- java/org/apache/tomcat/util/net/SSLUtilBase.java | 3 +-- 2 files changed, 3 insertions(+), 12 deletions(-) diff --git a/java/org/apache/tomcat/jni/Library.java b/java/org/apache/tomcat/jni/Library.java index 4cdf330..09fe13a 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.load(library.getAbsolutePath()); 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) { if (library.exists()) { @@ -67,11 +63,7 @@ public final class Library { try { System.loadLibrary(value); 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(value); diff --git a/java/org/apache/tomcat/util/net/SSLUtilBase.java b/java/org/apache/tomcat/util/net/SSLUtilBase.java index 56453f3..b201201 100644 --- a/java/org/apache/tomcat/util/net/SSLUtilBase.java +++ b/java/org/apache/tomcat/util/net/SSLUtilBase.java @@ -201,8 +201,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-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org