Author: markt
Date: Sun Jan 6 13:31:23 2008
New Revision: 609409
URL: http://svn.apache.org/viewvc?rev=609409&view=rev
Log:
Fix bug 43657. Possible class loader leak.
Modified:
tomcat/connectors/trunk/util/java/org/apache/tomcat/util/http/ServerCookie.java
tomcat/container/tc5.5.x/webapps/docs/changelog.xml
tomcat/current/tc5.5.x/STATUS.txt
tomcat/jasper/tc5.5.x/src/share/org/apache/jasper/xmlparser/ParserUtils.java
Modified:
tomcat/connectors/trunk/util/java/org/apache/tomcat/util/http/ServerCookie.java
URL:
http://svn.apache.org/viewvc/tomcat/connectors/trunk/util/java/org/apache/tomcat/util/http/ServerCookie.java?rev=609409&r1=609408&r2=609409&view=diff
==============================================================================
---
tomcat/connectors/trunk/util/java/org/apache/tomcat/util/http/ServerCookie.java
(original)
+++
tomcat/connectors/trunk/util/java/org/apache/tomcat/util/http/ServerCookie.java
Sun Jan 6 13:31:23 2008
@@ -37,10 +37,6 @@
*/
public class ServerCookie implements Serializable {
-
- private static org.apache.commons.logging.Log log =
- org.apache.commons.logging.LogFactory.getLog(ServerCookie.class);
-
// Version 0 (Netscape) attributes
private MessageBytes name=MessageBytes.newInstance();
private MessageBytes value=MessageBytes.newInstance();
@@ -123,11 +119,6 @@
// -------------------- utils --------------------
-
- public static void log(String s ) {
- if (log.isDebugEnabled())
- log.debug("ServerCookie: " + s);
- }
public String toString() {
return "Cookie " + getName() + "=" + getValue() + " ; "
Modified: tomcat/container/tc5.5.x/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/docs/changelog.xml?rev=609409&r1=609408&r2=609409&view=diff
==============================================================================
--- tomcat/container/tc5.5.x/webapps/docs/changelog.xml (original)
+++ tomcat/container/tc5.5.x/webapps/docs/changelog.xml Sun Jan 6 13:31:23 2008
@@ -62,9 +62,13 @@
</add>
<fix>
o.a.juli.ClassLoaderLogManager handle more then one system property
replacement at file logging.properties. (pero)
- </fix>
+ </fix>
<fix>
- <bug>43687</bug> Remove conditional headers on Form Auth replay, since
the UA (esp. FireFox) isn't expecting it. (billbarker)
+ <bug>43675</bug>: Fix a possible logging related class loader leak.
+ (markt)
+ </fix>
+ <fix>
+ <bug>43687</bug>: Remove conditional headers on Form Auth replay,
since the UA (esp. FireFox) isn't expecting it. (billbarker)
</fix>
<fix>
Fix bug in CGI Servlet that caused it to fail when a CGI resource was
Modified: tomcat/current/tc5.5.x/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/current/tc5.5.x/STATUS.txt?rev=609409&r1=609408&r2=609409&view=diff
==============================================================================
--- tomcat/current/tc5.5.x/STATUS.txt (original)
+++ tomcat/current/tc5.5.x/STATUS.txt Sun Jan 6 13:31:23 2008
@@ -47,12 +47,6 @@
-1:
0: fhanik, this needs to be reworked completely, so I'm neutral
-* Fix http://issues.apache.org/bugzilla/show_bug.cgi?id=43675 Possible logging
- releated class loader leak
- http://svn.apache.org/viewvc?rev=594700&view=rev
- +1: markt, pero, fhanik
- -1:
-
* Fix http://issues.apache.org/bugzilla/show_bug.cgi?id=43887
Include exception in log message
http://svn.apache.org/viewvc?rev=597738&view=rev
Modified:
tomcat/jasper/tc5.5.x/src/share/org/apache/jasper/xmlparser/ParserUtils.java
URL:
http://svn.apache.org/viewvc/tomcat/jasper/tc5.5.x/src/share/org/apache/jasper/xmlparser/ParserUtils.java?rev=609409&r1=609408&r2=609409&view=diff
==============================================================================
---
tomcat/jasper/tc5.5.x/src/share/org/apache/jasper/xmlparser/ParserUtils.java
(original)
+++
tomcat/jasper/tc5.5.x/src/share/org/apache/jasper/xmlparser/ParserUtils.java
Sun Jan 6 13:31:23 2008
@@ -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
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
