Author: markt Date: Thu Mar 29 19:59:37 2012 New Revision: 1307080 URL: http://svn.apache.org/viewvc?rev=1307080&view=rev Log: Import / @Override police
Modified: 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/Http11NioProtocol.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java?rev=1307080&r1=1307079&r2=1307080&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java (original) +++ tomcat/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java Thu Mar 29 19:59:37 2012 @@ -29,7 +29,6 @@ import org.apache.coyote.http11.upgrade. import org.apache.juli.logging.Log; import org.apache.juli.logging.LogFactory; import org.apache.tomcat.util.net.AbstractEndpoint; -import org.apache.tomcat.util.net.AbstractEndpoint.Handler.SocketState; import org.apache.tomcat.util.net.NioChannel; import org.apache.tomcat.util.net.NioEndpoint; import org.apache.tomcat.util.net.NioEndpoint.Handler; @@ -212,6 +211,7 @@ public class Http11NioProtocol extends A } } + @Override public SocketState process(SocketWrapper<NioChannel> socket, SocketStatus status) { if (proto.npnHandler != null) { 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=1307080&r1=1307079&r2=1307080&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/coyote/http11/Http11Protocol.java (original) +++ tomcat/trunk/java/org/apache/coyote/http11/Http11Protocol.java Thu Mar 29 19:59:37 2012 @@ -25,7 +25,6 @@ import org.apache.coyote.http11.upgrade. import org.apache.coyote.http11.upgrade.UpgradeInbound; import org.apache.juli.logging.Log; import org.apache.tomcat.util.net.AbstractEndpoint; -import org.apache.tomcat.util.net.AbstractEndpoint.Handler.SocketState; import org.apache.tomcat.util.net.JIoEndpoint; import org.apache.tomcat.util.net.JIoEndpoint.Handler; import org.apache.tomcat.util.net.SSLImplementation; @@ -134,6 +133,7 @@ public class Http11Protocol extends Abst return proto.sslImplementation; } + @Override public SocketState process(SocketWrapper<Socket> socket, SocketStatus status) { if (proto.npnHandler != null) { --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org