Author: markt
Date: Wed Aug 28 10:23:52 2013
New Revision: 1518147
URL: http://svn.apache.org/r1518147
Log:
Remove unnecessary code. inputBuffer.avaiable() now includes a call to nbRead()
to check for available data if the buffer is empty.
Modified:
tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java
Modified:
tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java?rev=1518147&r1=1518146&r2=1518147&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java Wed
Aug 28 10:23:52 2013
@@ -1585,16 +1585,8 @@ public abstract class AbstractHttp11Proc
} else if (status == SocketStatus.OPEN_READ &&
request.getReadListener() != null) {
try {
- try {
- if (inputBuffer.available() > 0 || inputBuffer.nbRead() >
0) {
- asyncStateMachine.asyncOperation();
- }
- } catch (IOException x) {
- if (getLog().isDebugEnabled()) {
- getLog().debug("Unable to read async data.",x);
- }
- status = SocketStatus.ASYNC_READ_ERROR;
- request.setAttribute(RequestDispatcher.ERROR_EXCEPTION, x);
+ if (inputBuffer.available() > 0) {
+ asyncStateMachine.asyncOperation();
}
} catch (IllegalStateException x) {
registerForEvent(true, false);
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
