From 6e10f14b5eaa084fb9ab9a8ba51885be69d5da20 Mon Sep 17 00:00:00 2001
From: markt <markt@13f79535-47bb-0310-9956-ffa450edef68>
Date: Sat, 11 Dec 2010 21:48:22 +0000
Subject: [PATCH] o.a.tomcat.jni should not have any external dependencies OK
 for o.a.naming to have dependencies

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1044729 13f79535-47bb-0310-9956-ffa450edef68
---
 java/org/apache/tomcat/jni/Library.java | 15 +++++++++------
 res/checkstyle/org-import-control.xml   |  6 +-----
 2 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/java/org/apache/tomcat/jni/Library.java b/java/org/apache/tomcat/jni/Library.java
index f887eefef..400f07233 100644
--- a/java/org/apache/tomcat/jni/Library.java
+++ b/java/org/apache/tomcat/jni/Library.java
@@ -17,8 +17,6 @@
 
 package org.apache.tomcat.jni;
 
-import org.apache.tomcat.util.ExceptionUtils;
-
 /** Library
  *
  * @author Mladen Turk
@@ -44,8 +42,13 @@ public final class Library {
                 System.loadLibrary(NAMES[i]);
                 loaded = true;
             }
-            catch (Throwable e) {
-                ExceptionUtils.handleThrowable(e);
+            catch (Throwable t) {
+                if (t instanceof ThreadDeath) {
+                    throw (ThreadDeath) t;
+                }
+                if (t instanceof VirtualMachineError) {
+                    throw (VirtualMachineError) t;
+                }
                 String name = System.mapLibraryName(NAMES[i]);
                 String path = System.getProperty("java.library.path");
                 String sep = System.getProperty("path.separator");
@@ -53,12 +56,12 @@ public final class Library {
                 for (int j=0; j<paths.length; j++) {
                     java.io.File fd = new java.io.File(paths[j] , name);
                     if (fd.exists()) {
-                        e.printStackTrace();
+                        t.printStackTrace();
                     }
                 }
                 if ( i > 0)
                     err += ", ";
-                err +=  e.getMessage();
+                err +=  t.getMessage();
             }
             if (loaded)
                 break;
diff --git a/res/checkstyle/org-import-control.xml b/res/checkstyle/org-import-control.xml
index ced46dca2..1cbd9c309 100644
--- a/res/checkstyle/org-import-control.xml
+++ b/res/checkstyle/org-import-control.xml
@@ -72,7 +72,6 @@
     <allow pkg="javax.mail"/>
     <allow pkg="javax.wsdl"/>
     <allow pkg="org.apache.naming"/>
-    <!-- To remove? -->
     <allow class="org.apache.catalina.util.RequestUtil"/>
     <allow class="org.apache.tomcat.util.http.FastHttpDateFormat"/>
   </subpackage>
@@ -81,10 +80,7 @@
     <subpackage name="buildutil">
       <allow pkg="org.apache.tools.ant"/>
     </subpackage>
-    <subpackage name="jni">
-      <!-- To remove? -->
-      <allow class="org.apache.tomcat.util.ExceptionUtils"/>
-    </subpackage>
+    <subpackage name="jni"/>
     <subpackage name="util">
       <allow pkg="org.apache.juli"/>
       <allow pkg="org.apache.tomcat.jni"/>
-- 
2.11.0