Author: markt
Date: Tue Apr 7 13:50:25 2015
New Revision: 1671848
URL: http://svn.apache.org/r1671848
Log:
Remove Java 7 feature so we can use the same Java code for tomcat-native in
Tomcat 6, 7 & 8.
Modified:
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/jni/Library.java
Modified: tomcat/tc8.0.x/trunk/java/org/apache/tomcat/jni/Library.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/tomcat/jni/Library.java?rev=1671848&r1=1671847&r2=1671848&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/java/org/apache/tomcat/jni/Library.java (original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/tomcat/jni/Library.java Tue Apr 7
13:50:25 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
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
