Author: markt
Date: Wed Nov 18 12:10:12 2009
New Revision: 881742
URL: http://svn.apache.org/viewvc?rev=881742&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48217
Make logs final and private; add missing @Override markers
Patch provided by sebb.
Modified:
tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java
tomcat/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java
tomcat/trunk/java/org/apache/coyote/http11/Http11Protocol.java
Modified: tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java?rev=881742&r1=881741&r2=881742&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java Wed
Nov 18 12:10:12 2009
@@ -39,7 +39,7 @@
*/
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;
Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java?rev=881742&r1=881741&r2=881742&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java Wed Nov
18 12:10:12 2009
@@ -69,6 +69,7 @@
/** Start the protocol
*/
+ @Override
public void init() throws Exception {
endpoint.setName(getName());
((NioEndpoint)endpoint).setHandler(cHandler);
@@ -85,6 +86,7 @@
}
+ @Override
public void start() throws Exception {
if( this.domain != null ) {
try {
@@ -465,7 +467,7 @@
- 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);
}
Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11Protocol.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11Protocol.java?rev=881742&r1=881741&r2=881742&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/Http11Protocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11Protocol.java Wed Nov 18
12:10:12 2009
@@ -47,7 +47,7 @@
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 @@
+ @Override
public void init() throws Exception {
((JIoEndpoint)endpoint).setName(getName());
((JIoEndpoint)endpoint).setHandler(cHandler);
@@ -124,6 +125,7 @@
}
+ @Override
public void start() throws Exception {
if (this.domain != null) {
try {
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
