Author: remy.maucherat(a)jboss.com Date: 2010-11-23 07:35:04 -0500 (Tue, 23 Nov 2010) New Revision: 1585 Modified: trunk/java/org/apache/catalina/core/AprLifecycleListener.java Log: - Drop teminate call. Modified: trunk/java/org/apache/catalina/core/AprLifecycleListener.java =================================================================== --- trunk/java/org/apache/catalina/core/AprLifecycleListener.java 2010-11-23 10:18:39 UTC (rev 1584) +++ trunk/java/org/apache/catalina/core/AprLifecycleListener.java 2010-11-23 12:35:04 UTC (rev 1585) @@ -89,33 +89,10 @@ } } } - } else if (Lifecycle.AFTER_STOP_EVENT.equals(event.getType())) { - if (!aprInitialized) { - return; - } - try { - terminateAPR(); - } catch (Throwable t) { - if (!log.isDebugEnabled()) { - log.info(sm.getString("aprListener.aprDestroy")); - } else { - log.debug(sm.getString("aprListener.aprDestroy"), t); - } - } } } - private static synchronized void terminateAPR() - throws ClassNotFoundException, NoSuchMethodException, - IllegalAccessException, InvocationTargetException - { - String methodName = "terminate"; - Method method = Class.forName("org.apache.tomcat.jni.Library") - .getMethod(methodName, (Class [])null); - method.invoke(null, (Object []) null); - } - private boolean init() { int major = 0; @@ -154,13 +131,6 @@ TCN_REQUIRED_MAJOR + "." + TCN_REQUIRED_MINOR + "." + TCN_REQUIRED_PATCH)); - try { - // Terminate the APR in case the version - // is below required. - terminateAPR(); - } catch (Throwable t) { - // Ignore - } return false; } if (patch < TCN_RECOMMENDED_PV) {