Author: rjung
Date: Tue Nov 3 01:25:24 2009
New Revision: 832245
URL: http://svn.apache.org/viewvc?rev=832245&view=rev
Log:
Fix BZ47712: Loading tcnative was broken in 5.5.28.
Modified:
tomcat/tc5.5.x/trunk/STATUS.txt
tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/core/AprLifecycleListener.java
tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml
Modified: tomcat/tc5.5.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/STATUS.txt?rev=832245&r1=832244&r2=832245&view=diff
==============================================================================
--- tomcat/tc5.5.x/trunk/STATUS.txt (original)
+++ tomcat/tc5.5.x/trunk/STATUS.txt Tue Nov 3 01:25:24 2009
@@ -152,13 +152,6 @@
+1: markt, kkolinko
-1:
-* Loading tcnative is broken since r795039.
- https://issues.apache.org/bugzilla/show_bug.cgi?id=47712
- https://issues.apache.org/bugzilla/attachment.cgi?id=24411
- +1: rjung, kkolinko, markt
- -1:
-
-
* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48097
There are two patches to be applied:
1) Make WebappClassLoader to do not swallow AccessControlException
@@ -175,3 +168,4 @@
http://svn.apache.org/viewvc?rev=831819&view=rev
+1: kkolinko
-1:
+
Modified:
tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/core/AprLifecycleListener.java
URL:
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/core/AprLifecycleListener.java?rev=832245&r1=832244&r2=832245&view=diff
==============================================================================
---
tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/core/AprLifecycleListener.java
(original)
+++
tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/core/AprLifecycleListener.java
Tue Nov 3 01:25:24 2009
@@ -81,16 +81,16 @@
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);
methodName = "randSet";
paramValues[0] = SSLRandomSeed;
clazz = Class.forName("org.apache.tomcat.jni.SSL");
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);
} catch (Throwable t) {
if (!log.isDebugEnabled()) {
log.info(sm.getString("aprListener.aprInit",
Modified: tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml?rev=832245&r1=832244&r2=832245&view=diff
==============================================================================
--- tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml (original)
+++ tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml Tue Nov 3
01:25:24 2009
@@ -35,6 +35,9 @@
<section name="Tomcat 5.5.29 (fhanik)">
<subsection name="General">
<changelog>
+ <fix>
+ <bug>47712</bug>: Loading tcnative was broken in 5.5.28. (rjung)
+ </fix>
<update>
Deprecate the jni Buffer and Thread classes. (rjung)
</update>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
