Remove Java 7 references
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 @@
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 @@
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 @@
// 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 ""
