Author: markt
Date: Thu Feb 12 20:03:29 2015
New Revision: 1659386
URL: http://svn.apache.org/r1659386
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.
Added:
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/jni/LibraryNotFoundError.java
- copied unchanged from r1659384,
tomcat/trunk/java/org/apache/tomcat/jni/LibraryNotFoundError.java
Modified:
tomcat/tc8.0.x/trunk/ (props changed)
tomcat/tc8.0.x/trunk/java/org/apache/catalina/core/AprLifecycleListener.java
tomcat/tc8.0.x/trunk/java/org/apache/catalina/core/LocalStrings.properties
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/jni/Library.java
tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc8.0.x/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Feb 12 20:03:29 2015
@@ -1 +1 @@
-/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886,1644890,1644892
,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654513,1654515,1654517,1654522,1654524,1654725,1654735,1654766,1654785,1654851-1654852,1654978,1655122-1655124,1655126-1655127,1655129-1655130,1655132-1655133,1655312,1655438,1655441,1655454,1655558,1656087,1656299,1656319,1656331,1656345,1656350,1656590,1656648-1656650,1656657,1657041,1657054,1657374,1657492,1657510,1657565,1657580,1657584,1657586,1657589,1657592,1657607,1657609,1657682,1657
907,1658207,1658734,1658781,1658790,1658799,1658802,1658804,1658833,1658840,1658966,1659043,1659053,1659059,1659188-1659189,1659263,1659293,1659304,1659306-1659307
+/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886,1644890,1644892
,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654513,1654515,1654517,1654522,1654524,1654725,1654735,1654766,1654785,1654851-1654852,1654978,1655122-1655124,1655126-1655127,1655129-1655130,1655132-1655133,1655312,1655438,1655441,1655454,1655558,1656087,1656299,1656319,1656331,1656345,1656350,1656590,1656648-1656650,1656657,1657041,1657054,1657374,1657492,1657510,1657565,1657580,1657584,1657586,1657589,1657592,1657607,1657609,1657682,1657
907,1658207,1658734,1658781,1658790,1658799,1658802,1658804,1658833,1658840,1658966,1659043,1659053,1659059,1659188-1659189,1659263,1659293,1659304,1659306-1659307,1659382,1659384
Modified:
tomcat/tc8.0.x/trunk/java/org/apache/catalina/core/AprLifecycleListener.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/core/AprLifecycleListener.java?rev=1659386&r1=1659385&r2=1659386&view=diff
==============================================================================
---
tomcat/tc8.0.x/trunk/java/org/apache/catalina/core/AprLifecycleListener.java
(original)
+++
tomcat/tc8.0.x/trunk/java/org/apache/catalina/core/AprLifecycleListener.java
Thu Feb 12 20:03:29 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/tc8.0.x/trunk/java/org/apache/catalina/core/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/core/LocalStrings.properties?rev=1659386&r1=1659385&r2=1659386&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/java/org/apache/catalina/core/LocalStrings.properties
(original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/catalina/core/LocalStrings.properties
Thu Feb 12 20:03:29 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/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=1659386&r1=1659385&r2=1659386&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 Thu Feb 12
20:03:29 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());
}
}
Modified: tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml?rev=1659386&r1=1659385&r2=1659386&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml Thu Feb 12 20:03:29 2015
@@ -84,6 +84,11 @@
case-insensitive (as documented) and than the case-insensitive
comparison is performed using the system default Locale. (markt)
</fix>
+ <add>
+ <bug>57021</bug>: Improve logging in AprLifecycleListener and
+ jni.Library when Tomcat-Native DLL fails to load. Based on a patch by
+ Pravallika Peddi. (markt)
+ </add>
</changelog>
</subsection>
<subsection name="Coyote">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
