Author: markt
Date: Wed Apr 14 22:19:33 2010
New Revision: 934222
URL: http://svn.apache.org/viewvc?rev=934222&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=49103
Add @Override where appropriate
Modified:
tomcat/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java
tomcat/trunk/java/org/apache/coyote/http11/Http11Protocol.java
tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java
tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java
tomcat/trunk/java/org/apache/tomcat/util/net/jsse/JSSEImplementation.java
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=934222&r1=934221&r2=934222&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java Wed Apr
14 22:19:33 2010
@@ -52,6 +52,7 @@ public class Http11NioProtocol extends A
private static final Log log = LogFactory.getLog(Http11NioProtocol.class);
+ @Override
protected Log getLog() { return log; }
public Http11NioProtocol() {
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=934222&r1=934221&r2=934222&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/Http11Protocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11Protocol.java Wed Apr 14
22:19:33 2010
@@ -55,6 +55,7 @@ public class Http11Protocol extends Abst
private static final org.apache.juli.logging.Log log
= org.apache.juli.logging.LogFactory.getLog(Http11Protocol.class);
+ @Override
public Log getLog() { return log; }
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java?rev=934222&r1=934221&r2=934222&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java Wed Apr 14
22:19:33 2010
@@ -358,6 +358,7 @@ public class AprEndpoint extends Abstrac
/**
* Initialize the endpoint.
*/
+ @Override
public void init()
throws Exception {
@@ -515,6 +516,7 @@ public class AprEndpoint extends Abstrac
/**
* Start the APR endpoint, creating acceptor, poller and sendfile threads.
*/
+ @Override
public void start()
throws Exception {
// Initialize socket if not done before
@@ -580,6 +582,7 @@ public class AprEndpoint extends Abstrac
/**
* Pause the endpoint, which will make it stop accepting new sockets.
*/
+ @Override
public void pause() {
if (running && !paused) {
paused = true;
@@ -592,6 +595,7 @@ public class AprEndpoint extends Abstrac
* Resume the endpoint, which will make it start accepting new sockets
* again.
*/
+ @Override
public void resume() {
if (running) {
paused = false;
@@ -628,6 +632,7 @@ public class AprEndpoint extends Abstrac
/**
* Deallocate APR memory pools, and close server socket.
*/
+ @Override
public void destroy() throws Exception {
if (running) {
stop();
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java?rev=934222&r1=934221&r2=934222&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java Wed Apr 14
22:19:33 2010
@@ -478,6 +478,7 @@ public class NioEndpoint extends Abstrac
/**
* Initialize the endpoint.
*/
+ @Override
public void init()
throws Exception {
@@ -569,6 +570,7 @@ public class NioEndpoint extends Abstrac
/**
* Start the NIO endpoint, creating acceptor, poller threads.
*/
+ @Override
public void start()
throws Exception {
// Initialize socket if not done before
@@ -608,6 +610,7 @@ public class NioEndpoint extends Abstrac
/**
* Pause the endpoint, which will make it stop accepting new sockets.
*/
+ @Override
public void pause() {
if (running && !paused) {
paused = true;
@@ -620,6 +623,7 @@ public class NioEndpoint extends Abstrac
* Resume the endpoint, which will make it start accepting new sockets
* again.
*/
+ @Override
public void resume() {
if (running) {
paused = false;
@@ -653,6 +657,7 @@ public class NioEndpoint extends Abstrac
/**
* Deallocate NIO memory pools, and close server socket.
*/
+ @Override
public void destroy() throws Exception {
if (log.isDebugEnabled()) {
log.debug("Destroy initiated for "+new
InetSocketAddress(getAddress(),getPort()));
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/jsse/JSSEImplementation.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/jsse/JSSEImplementation.java?rev=934222&r1=934221&r2=934222&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/jsse/JSSEImplementation.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/jsse/JSSEImplementation.java
Wed Apr 14 22:19:33 2010
@@ -64,6 +64,7 @@ public class JSSEImplementation extends
return ssls;
}
+ @Override
public SSLSupport getSSLSupport(SSLSession session) {
SSLSupport ssls = factory.getSSLSupport(session);
return ssls;
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
