Author: markt
Date: Fri Nov 16 12:02:12 2007
New Revision: 595799
URL: http://svn.apache.org/viewvc?rev=595799&view=rev
Log:
Fix possible logging related classloader leak.
Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/jasper/xmlparser/ParserUtils.java
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/http/ServerCookie.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=595799&r1=595798&r2=595799&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Fri Nov 16 12:02:12 2007
@@ -47,13 +47,6 @@
+1: jfclere
-1: fhanik - Can we add the 'package' directive to make the package match
the dir structure
-* Fix BZ 43675 - Possible logging related classloader leak
- Better patch that removes ServerCookie.log(String) entirely as per
- Remy's -1 comment on previous patch
- http://svn.apache.org/viewvc?view=rev&revision=594700
- +1: markt, remm, fhanik, pero
- -1:
-
* Fix BZ 43846
Fix output of data on simulated blocking IO
Improve speed of writing and reading
Modified: tomcat/tc6.0.x/trunk/java/org/apache/jasper/xmlparser/ParserUtils.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/jasper/xmlparser/ParserUtils.java?rev=595799&r1=595798&r2=595799&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/jasper/xmlparser/ParserUtils.java
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/jasper/xmlparser/ParserUtils.java Fri
Nov 16 12:02:12 2007
@@ -191,9 +191,6 @@
class MyEntityResolver implements EntityResolver {
- // Logger
- private Log log = LogFactory.getLog(MyEntityResolver.class);
-
public InputSource resolveEntity(String publicId, String systemId)
throws SAXException {
for (int i = 0; i < Constants.CACHED_DTD_PUBLIC_IDS.length; i++) {
@@ -210,6 +207,7 @@
return isrc;
}
}
+ Log log = LogFactory.getLog(MyEntityResolver.class);
if (log.isDebugEnabled())
log.debug("Resolve entity failed" + publicId + " " + systemId);
log.error(Localizer.getMessage("jsp.error.parse.xml.invalidPublicId",
@@ -220,10 +218,8 @@
class MyErrorHandler implements ErrorHandler {
- // Logger
- private Log log = LogFactory.getLog(MyErrorHandler.class);
-
public void warning(SAXParseException ex) throws SAXException {
+ Log log = LogFactory.getLog(MyErrorHandler.class);
if (log.isDebugEnabled())
log.debug("ParserUtils: warning ", ex);
// We ignore warnings
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/http/ServerCookie.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/http/ServerCookie.java?rev=595799&r1=595798&r2=595799&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/http/ServerCookie.java
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/http/ServerCookie.java Fri
Nov 16 12:02:12 2007
@@ -38,9 +38,6 @@
public class ServerCookie implements Serializable {
- private static org.apache.juli.logging.Log log =
- org.apache.juli.logging.LogFactory.getLog(ServerCookie.class);
-
// Version 0 (Netscape) attributes
private MessageBytes name=MessageBytes.newInstance();
private MessageBytes value=MessageBytes.newInstance();
@@ -123,11 +120,6 @@
// -------------------- utils --------------------
-
- public static void log(String s ) {
- if (log.isDebugEnabled())
- log.debug("ServerCookie: " + s);
- }
public String toString() {
return "Cookie " + getName() + "=" + getValue() + " ; "
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=595799&r1=595798&r2=595799&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Fri Nov 16 12:02:12 2007
@@ -47,6 +47,20 @@
</fix>
</changelog>
</subsection>
+ <subsection name="Catalina">
+ <changelog>
+ <fix>
+ <bug>43675</bug>: Fix a possible logging related classloader leak
(markt).
+ </fix>
+ </changelog>
+ </subsection>
+ <subsection name="Jasper">
+ <changelog>
+ <fix>
+ <bug>43675</bug>: Fix a possible logging related classloader leak
(markt).
+ </fix>
+ </changelog>
+ </subsection>
</section>
<section name="Tomcat 6.0.15 (remm)">
<subsection name="General">
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
