Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48217

Make logs final and private; add missing @Override markers
Patch provided by sebb.

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

diff --git a/java/org/apache/coyote/http11/AbstractHttp11Protocol.java b/java/org/apache/coyote/http11/AbstractHttp11Protocol.java
index ed1dba9..e9944cb 100644 (file)
--- a/java/org/apache/coyote/http11/AbstractHttp11Protocol.java
+++ b/java/org/apache/coyote/http11/AbstractHttp11Protocol.java
@@ -39,7 +39,7 @@ public abstract class AbstractHttp11Protocol implements ProtocolHandler, MBeanRe
      */
     protected static final StringManager sm = StringManager.getManager(Constants.Package);
     
-    protected static org.apache.juli.logging.Log log = org.apache.juli.logging.LogFactory.getLog(AbstractHttp11Protocol.class);
+    private static final org.apache.juli.logging.Log log = org.apache.juli.logging.LogFactory.getLog(AbstractHttp11Protocol.class);
     
     protected ObjectName tpOname = null;
     protected ObjectName rgOname = null;

diff --git a/java/org/apache/coyote/http11/Http11NioProtocol.java b/java/org/apache/coyote/http11/Http11NioProtocol.java
index 00dfe5b..557842f 100644 (file)
--- a/java/org/apache/coyote/http11/Http11NioProtocol.java
+++ b/java/org/apache/coyote/http11/Http11NioProtocol.java
@@ -69,6 +69,7 @@ public class Http11NioProtocol extends AbstractHttp11Protocol {
 
     /** Start the protocol
      */
+    @Override
     public void init() throws Exception {
         endpoint.setName(getName());
         ((NioEndpoint)endpoint).setHandler(cHandler);
@@ -85,6 +86,7 @@ public class Http11NioProtocol extends AbstractHttp11Protocol {
 
     }
 
+    @Override
     public void start() throws Exception {
         if( this.domain != null ) {
             try {
@@ -465,7 +467,7 @@ public class Http11NioProtocol extends AbstractHttp11Protocol {
     
 
 
-    protected static final org.apache.juli.logging.Log log
+    private static final org.apache.juli.logging.Log log
         = org.apache.juli.logging.LogFactory.getLog(Http11NioProtocol.class);
 
 }

diff --git a/java/org/apache/coyote/http11/Http11Protocol.java b/java/org/apache/coyote/http11/Http11Protocol.java
index 12ac2c8..dd1a945 100644 (file)
--- a/java/org/apache/coyote/http11/Http11Protocol.java
+++ b/java/org/apache/coyote/http11/Http11Protocol.java
@@ -47,7 +47,7 @@ import org.apache.tomcat.util.net.JIoEndpoint.Handler;
 public class Http11Protocol extends AbstractHttp11Protocol {
 
 
-    protected static final org.apache.juli.logging.Log log
+    private static final org.apache.juli.logging.Log log
         = org.apache.juli.logging.LogFactory.getLog(Http11Protocol.class);
 
 
@@ -83,6 +83,7 @@ public class Http11Protocol extends AbstractHttp11Protocol {
 
 
 
+    @Override
     public void init() throws Exception {
         ((JIoEndpoint)endpoint).setName(getName());
         ((JIoEndpoint)endpoint).setHandler(cHandler);
@@ -124,6 +125,7 @@ public class Http11Protocol extends AbstractHttp11Protocol {
 
     }
 
+    @Override
     public void start() throws Exception {
         if (this.domain != null) {
             try {