Author: markt
Date: Wed Apr 8 09:19:03 2015
New Revision: 1672041
URL: http://svn.apache.org/r1672041
Log:
Follow-up to r1671865. Java 6 compatibility. Need to catch Throwable to catch
the UnsatisifiedLinkError
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/jni/Library.java
Modified: tomcat/tc7.0.x/trunk/java/org/apache/tomcat/jni/Library.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/jni/Library.java?rev=1672041&r1=1672040&r2=1672041&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/tomcat/jni/Library.java (original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/tomcat/jni/Library.java Wed Apr 8
09:19:03 2015
@@ -32,7 +32,7 @@ public final class Library {
*/
private static Library _instance = null;
- private Library() throws Exception {
+ private Library() throws Throwable {
boolean loaded = false;
String path = System.getProperty("java.library.path");
String [] paths = path.split(File.pathSeparator);
@@ -47,7 +47,7 @@ public final class Library {
// 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 (Exception t) {
+ } catch (Throwable t) {
String name = System.mapLibraryName(NAMES[i]);
for (int j = 0; j < paths.length; j++) {
java.io.File fd = new java.io.File(paths[j] , name);
@@ -168,7 +168,7 @@ public final class Library {
* @param libraryName the name of the library to load
*/
public static boolean initialize(String libraryName)
- throws Exception
+ throws Throwable
{
if (_instance == null) {
if (libraryName == null)
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
