Author: markt
Date: Mon Nov 2 14:26:47 2015
New Revision: 1712011
URL: http://svn.apache.org/viewvc?rev=1712011&view=rev
Log:
Align with 6/7/8
Modified:
tomcat/trunk/java/org/apache/tomcat/jni/Library.java
Modified: tomcat/trunk/java/org/apache/tomcat/jni/Library.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/jni/Library.java?rev=1712011&r1=1712010&r2=1712011&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/jni/Library.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/jni/Library.java Mon Nov 2 14:26:47
2015
@@ -41,7 +41,11 @@ public final class Library {
try {
System.loadLibrary(NAMES[i]);
loaded = true;
- } catch (ThreadDeath | VirtualMachineError t) {
+ } 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
throw t;
} catch (Throwable t) {
String name = System.mapLibraryName(NAMES[i]);
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
