Author: markt
Date: Tue Nov 13 15:13:24 2007
New Revision: 594700
URL: http://svn.apache.org/viewvc?rev=594700&view=rev
Log:
Better patch for BZ 43675 in response to Remy's -1 to previous patch
Modified:
tomcat/trunk/java/org/apache/jasper/xmlparser/ParserUtils.java
tomcat/trunk/java/org/apache/tomcat/util/http/ServerCookie.java
Modified: tomcat/trunk/java/org/apache/jasper/xmlparser/ParserUtils.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/xmlparser/ParserUtils.java?rev=594700&r1=594699&r2=594700&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/xmlparser/ParserUtils.java (original)
+++ tomcat/trunk/java/org/apache/jasper/xmlparser/ParserUtils.java Tue Nov 13
15:13:24 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/trunk/java/org/apache/tomcat/util/http/ServerCookie.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/http/ServerCookie.java?rev=594700&r1=594699&r2=594700&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/http/ServerCookie.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/http/ServerCookie.java Tue Nov 13
15:13:24 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() + " ; "
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
