You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2015/02/12 20:59:10 UTC
svn commit: r1659382 - in /tomcat/trunk/java/org/apache:
catalina/core/AprLifecycleListener.java
catalina/core/LocalStrings.properties tomcat/jni/Library.java
Author: markt
Date: Thu Feb 12 19:59:10 2015
New Revision: 1659382
URL: http://svn.apache.org/r1659382
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=57021
Improve logging in AprLifecycleListener and jni.Library when Tomcat-Native DLL fails to load.
Based on a patch by Pravallika Peddi.
Modified:
tomcat/trunk/java/org/apache/catalina/core/AprLifecycleListener.java
tomcat/trunk/java/org/apache/catalina/core/LocalStrings.properties
tomcat/trunk/java/org/apache/tomcat/jni/Library.java
Modified: tomcat/trunk/java/org/apache/catalina/core/AprLifecycleListener.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/AprLifecycleListener.java?rev=1659382&r1=1659381&r2=1659382&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/AprLifecycleListener.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/AprLifecycleListener.java Thu Feb 12 19:59:10 2015
@@ -29,6 +29,7 @@ import org.apache.catalina.LifecycleList
import org.apache.juli.logging.Log;
import org.apache.juli.logging.LogFactory;
import org.apache.tomcat.jni.Library;
+import org.apache.tomcat.jni.LibraryNotFoundError;
import org.apache.tomcat.jni.SSL;
import org.apache.tomcat.util.ExceptionUtils;
import org.apache.tomcat.util.res.StringManager;
@@ -193,23 +194,27 @@ public class AprLifecycleListener
aprInitialized = true;
try {
- String methodName = "initialize";
- Class<?> paramTypes[] = new Class[1];
- paramTypes[0] = String.class;
- Object paramValues[] = new Object[1];
- paramValues[0] = null;
- Class<?> clazz = Class.forName("org.apache.tomcat.jni.Library");
- Method method = clazz.getMethod(methodName, paramTypes);
- method.invoke(null, paramValues);
- major = clazz.getField("TCN_MAJOR_VERSION").getInt(null);
- minor = clazz.getField("TCN_MINOR_VERSION").getInt(null);
- patch = clazz.getField("TCN_PATCH_VERSION").getInt(null);
+ Library.initialize(null);
+ major = Library.TCN_MAJOR_VERSION;
+ minor = Library.TCN_MINOR_VERSION;
+ patch = Library.TCN_PATCH_VERSION;
apver = major * 1000 + minor * 100 + patch;
+ } catch (LibraryNotFoundError lnfe) {
+ // Library not on path
+ if (log.isDebugEnabled()) {
+ initInfoLogMessages.add(sm.getString("aprListener.aprInitDebug",
+ lnfe.getLibraryNames(), System.getProperty("java.library.path"),
+ lnfe.getMessage()));
+ } else {
+ initInfoLogMessages.add(sm.getString("aprListener.aprInit",
+ System.getProperty("java.library.path")));
+ }
+ return;
} catch (Throwable t) {
+ // Library present but failed to load
t = ExceptionUtils.unwrapInvocationTargetException(t);
ExceptionUtils.handleThrowable(t);
- initInfoLogMessages.add(sm.getString("aprListener.aprInit",
- System.getProperty("java.library.path")));
+ initInfoLogMessages.add(sm.getString("aprListener.aprInitError", t.getMessage()));
return;
}
if (apver < rqver) {
Modified: tomcat/trunk/java/org/apache/catalina/core/LocalStrings.properties
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/LocalStrings.properties?rev=1659382&r1=1659381&r2=1659382&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/LocalStrings.properties (original)
+++ tomcat/trunk/java/org/apache/catalina/core/LocalStrings.properties Thu Feb 12 19:59:10 2015
@@ -51,6 +51,8 @@ applicationServletRegistration.setServle
applicationServletRegistration.setServletSecurity.ise=Security constraints can't be added to servlet [{0}] deployed to context with name [{1}] as the context has already been initialised
applicationSessionCookieConfig.ise=Property {0} can not be added to SessionCookieConfig for context {1} as the context has been initialised
aprListener.aprInit=The APR based Apache Tomcat Native library which allows optimal performance in production environments was not found on the java.library.path: {0}
+aprListener.aprInitDebug=The APR based Apache Tomcat Native library could not be found using names [{0}] on the java.library.path [{1}]. The errors reported were [{2}]
+aprListener.aprInitError=The APR based Apache Tomcat Native library failed to load. The error reported was [{0}]
aprListener.tcnInvalid=An incompatible version {0} of the APR based Apache Tomcat Native library is installed, while Tomcat requires version {1}
aprListener.tcnVersion=An older version {0} of the APR based Apache Tomcat Native library is installed, while Tomcat recommends a minimum version of {1}
aprListener.aprDestroy=Failed shutdown of APR based Apache Tomcat Native library
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=1659382&r1=1659381&r2=1659382&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/jni/Library.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/jni/Library.java Thu Feb 12 19:59:10 2015
@@ -34,25 +34,22 @@ public final class Library {
private Library() throws Exception {
boolean loaded = false;
+ String path = System.getProperty("java.library.path");
+ String [] paths = path.split(File.pathSeparator);
StringBuilder err = new StringBuilder();
for (int i = 0; i < NAMES.length; i++) {
try {
System.loadLibrary(NAMES[i]);
loaded = true;
+ } catch (ThreadDeath | VirtualMachineError t) {
+ throw t;
} 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 [] paths = path.split(File.pathSeparator);
for (int j = 0; j < paths.length; j++) {
java.io.File fd = new java.io.File(paths[j] , name);
if (fd.exists()) {
- t.printStackTrace();
+ // File exists but failed to load
+ throw t;
}
}
if (i > 0) {
@@ -65,10 +62,12 @@ public final class Library {
}
}
if (!loaded) {
- err.append('(');
- err.append(System.getProperty("java.library.path"));
- err.append(')');
- throw new UnsatisfiedLinkError(err.toString());
+ StringBuilder names = new StringBuilder();
+ for (String name : NAMES) {
+ names.append(name);
+ names.append(", ");
+ }
+ throw new LibraryNotFoundError(names.substring(0, names.length() -2), err.toString());
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org