Author: markt
Date: Mon Sep 13 17:28:53 2010
New Revision: 996608
URL: http://svn.apache.org/viewvc?rev=996608&view=rev
Log:
Code clean-up
Modified:
tomcat/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java
tomcat/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java
tomcat/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java
Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java?rev=996608&r1=996607&r2=996608&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java Mon Sep
13 17:28:53 2010
@@ -353,7 +353,7 @@ public class Http11AprProcessor extends
}
/* Copied from the AjpProcessor.java */
- public SocketState asyncDispatch(long socket, SocketStatus status) throws
IOException {
+ public SocketState asyncDispatch(long socket, SocketStatus status) {
// Setting up the socket
this.socket = socket;
@@ -439,6 +439,7 @@ public class Http11AprProcessor extends
* @param actionCode Type of the action
* @param param Action parameter
*/
+ @Override
public void action(ActionCode actionCode, Object param) {
if (actionCode == ActionCode.ACTION_COMMIT) {
Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java?rev=996608&r1=996607&r2=996608&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java Mon Sep
13 17:28:53 2010
@@ -251,6 +251,7 @@ public class Http11AprProtocol extends A
new ConcurrentHashMap<Long, Http11AprProcessor>();
protected ConcurrentLinkedQueue<Http11AprProcessor> recycledProcessors
=
new ConcurrentLinkedQueue<Http11AprProcessor>() {
+ private static final long serialVersionUID = 1L;
protected AtomicInteger size = new AtomicInteger(0);
@Override
public boolean offer(Http11AprProcessor processor) {
@@ -396,21 +397,10 @@ public class Http11AprProtocol extends A
// Call the appropriate event
try {
state = result.asyncDispatch(socket, status);
- } catch (java.net.SocketException e) {
- // SocketExceptions are normal
- Http11AprProtocol.log.debug
- (sm.getString
- ("http11protocol.proto.socketexception.debug"), e);
- } catch (java.io.IOException e) {
- // IOExceptions are normal
- Http11AprProtocol.log.debug
- (sm.getString
- ("http11protocol.proto.ioexception.debug"), e);
- }
- // Future developers: if you discover any other
- // rare-but-nonfatal exceptions, catch them here, and log as
+ // Future developers: if you discover any rare-but-nonfatal
+ // exceptions, catch them here, and log as per {...@link
#event()}
// above.
- catch (Throwable e) {
+ } catch (Throwable e) {
// any other exception or error is odd. Here we log it
// with "ERROR" level, so it will show up even on
// less-than-verbose logs.
Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java?rev=996608&r1=996607&r2=996608&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java Mon Sep
13 17:28:53 2010
@@ -514,6 +514,7 @@ public class Http11NioProcessor extends
* @param actionCode Type of the action
* @param param Action parameter
*/
+ @Override
public void action(ActionCode actionCode, Object param) {
if (actionCode == ActionCode.ACTION_COMMIT) {
@@ -1047,7 +1048,7 @@ public class Http11NioProcessor extends
* When committing the response, we have to validate the set of headers, as
* well as setup the response filters.
*/
- protected void prepareResponse() throws IOException {
+ protected void prepareResponse() {
boolean entityBody = true;
contentDelimitation = false;
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
