Better patch for BZ 43675 in response to Remy's -1 to previous patch

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@594700 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/java/org/apache/jasper/xmlparser/ParserUtils.java b/java/org/apache/jasper/xmlparser/ParserUtils.java
index e27cc85..e73f9e4 100644 (file)
--- a/java/org/apache/jasper/xmlparser/ParserUtils.java
+++ b/java/org/apache/jasper/xmlparser/ParserUtils.java
@@ -191,9 +191,6 @@ public class ParserUtils {
 
 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 @@ class MyEntityResolver implements EntityResolver {
                 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 MyEntityResolver implements EntityResolver {
 
 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

diff --git a/java/org/apache/tomcat/util/http/ServerCookie.java b/java/org/apache/tomcat/util/http/ServerCookie.java
index 961966e..263c122 100644 (file)
--- a/java/org/apache/tomcat/util/http/ServerCookie.java
+++ b/java/org/apache/tomcat/util/http/ServerCookie.java
@@ -38,9 +38,6 @@ import org.apache.tomcat.util.buf.MessageBytes;
 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();
@@ -124,11 +121,6 @@ public class ServerCookie implements Serializable {
 
     // -------------------- utils --------------------
 
-    public static void log(String s ) {
-        if (log.isDebugEnabled())
-            log.debug("ServerCookie: " + s);
-    }
-
     public String toString() {
         return "Cookie " + getName() + "=" + getValue() + " ; "
             + getVersion() + " " + getPath() + " " + getDomain();