Author: markt
Date: Thu Feb 18 09:53:12 2010
New Revision: 911300
URL: http://svn.apache.org/viewvc?rev=911300&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48613
Only attempt APR initialization if the <Listener> has been specified (fhanik)
Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/AprLifecycleListener.java
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=911300&r1=911299&r2=911300&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Thu Feb 18 09:53:12 2010
@@ -68,12 +68,6 @@
-1: remm: no for TC 6.0
-1: funkman : api change in Session.java for .x.x release
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48613
- Only attempt APR initialization if the <Listener> has been specified
- http://svn.apache.org/viewvc?rev=904224&view=rev
- +1: fhanik, markt, kkolinko, mturk
- -1:
-
* Fix the maven stuff for the maven repo.
Before it does't find tomcat-juli.jar and the remoteRepository seems broken .
http://people.apache.org/~jfclere/patches/maven.patch
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/AprLifecycleListener.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/AprLifecycleListener.java?rev=911300&r1=911299&r2=911300&view=diff
==============================================================================
---
tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/AprLifecycleListener.java
(original)
+++
tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/AprLifecycleListener.java
Thu Feb 18 09:53:12 2010
@@ -46,6 +46,7 @@
private static Log log = LogFactory.getLog(AprLifecycleListener.class);
+ private static boolean instanceCreated = false;
/**
* The string manager for this package.
*/
@@ -71,9 +72,14 @@
protected static boolean aprAvailable = false;
public static boolean isAprAvailable() {
- init();
+ //https://issues.apache.org/bugzilla/show_bug.cgi?id=48613
+ if (instanceCreated) init();
return aprAvailable;
}
+
+ public AprLifecycleListener() {
+ instanceCreated = true;
+ }
// ---------------------------------------------- LifecycleListener Methods
Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=911300&r1=911299&r2=911300&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Thu Feb 18 09:53:12 2010
@@ -38,6 +38,10 @@
<subsection name="Catalina">
<changelog>
<fix>
+ <bug>48613</bug>: Further fixes to ensure APRLifecycleListener is only
+ used if defined in server.xml. (fhanik)
+ </fix>
+ <fix>
<bug>48614</bug>: Correct JULI log file buffering so default behaviour
is no buffering. (fhanik)
</fix>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
