Author: markt
Date: Mon Dec 14 14:47:06 2015
New Revision: 1719927
URL: http://svn.apache.org/viewvc?rev=1719927&view=rev
Log:
Remove unused code
Modified:
tomcat/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java
tomcat/trunk/java/org/apache/coyote/http2/Http2UpgradeHandler.java
tomcat/trunk/java/org/apache/tomcat/util/net/SocketEvent.java
tomcat/trunk/java/org/apache/tomcat/websocket/server/WsHttpUpgradeHandler.java
tomcat/trunk/test/org/apache/coyote/http11/upgrade/TestUpgradeInternalHandler.java
Modified: tomcat/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java?rev=1719927&r1=1719926&r2=1719927&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java Mon Dec
14 14:47:06 2015
@@ -157,27 +157,6 @@ public class CoyoteAdapter implements Ad
if (!asyncConImpl.timeout()) {
asyncConImpl.setErrorState(null, false);
}
- } else if (status==SocketEvent.ASYNC_READ_ERROR) {
- // A async read error is an IO error which means the socket
- // needs to be closed so set success to false to trigger a
- // close
- success = false;
- Throwable t = (Throwable)req.getAttribute(
- RequestDispatcher.ERROR_EXCEPTION);
- req.getAttributes().remove(RequestDispatcher.ERROR_EXCEPTION);
- ReadListener readListener = req.getReadListener();
- if (readListener != null) {
- ClassLoader oldCL = null;
- try {
- oldCL = request.getContext().bind(false, null);
- readListener.onError(t);
- } finally {
- request.getContext().unbind(false, oldCL);
- }
- }
- if (t != null) {
- asyncConImpl.setErrorState(t, true);
- }
} else if (status==SocketEvent.ASYNC_WRITE_ERROR) {
// A async write error is an IO error which means the socket
// needs to be closed so set success to false to trigger a
Modified: tomcat/trunk/java/org/apache/coyote/http2/Http2UpgradeHandler.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http2/Http2UpgradeHandler.java?rev=1719927&r1=1719926&r2=1719927&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http2/Http2UpgradeHandler.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http2/Http2UpgradeHandler.java Mon Dec
14 14:47:06 2015
@@ -319,7 +319,6 @@ public class Http2UpgradeHandler extends
result = SocketState.UPGRADED;
break;
- case ASYNC_READ_ERROR:
case ASYNC_WRITE_ERROR:
case CLOSE_NOW:
// This should never happen and will be fatal for this
connection.
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/SocketEvent.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/SocketEvent.java?rev=1719927&r1=1719926&r2=1719927&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/SocketEvent.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/SocketEvent.java Mon Dec 14
14:47:06 2015
@@ -65,13 +65,6 @@ public enum SocketEvent {
ASYNC_WRITE_ERROR,
/**
- * Unused as of 9.0.x.
- *
- * TODO: Remove this.
- */
- ASYNC_READ_ERROR,
-
- /**
* Initiated by the container when an I/O error is detected on a
* non-container thread.
*
Modified:
tomcat/trunk/java/org/apache/tomcat/websocket/server/WsHttpUpgradeHandler.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/server/WsHttpUpgradeHandler.java?rev=1719927&r1=1719926&r2=1719927&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/tomcat/websocket/server/WsHttpUpgradeHandler.java
(original)
+++
tomcat/trunk/java/org/apache/tomcat/websocket/server/WsHttpUpgradeHandler.java
Mon Dec 14 14:47:06 2015
@@ -179,7 +179,6 @@ public class WsHttpUpgradeHandler implem
wsSession.doClose(new CloseReason(CloseCodes.GOING_AWAY, msg),
new CloseReason(CloseCodes.CLOSED_ABNORMALLY, msg));
//$FALL-THROUGH$
- case ASYNC_READ_ERROR:
case ASYNC_WRITE_ERROR:
case CLOSE_NOW:
case DISCONNECT:
Modified:
tomcat/trunk/test/org/apache/coyote/http11/upgrade/TestUpgradeInternalHandler.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/coyote/http11/upgrade/TestUpgradeInternalHandler.java?rev=1719927&r1=1719926&r2=1719927&view=diff
==============================================================================
---
tomcat/trunk/test/org/apache/coyote/http11/upgrade/TestUpgradeInternalHandler.java
(original)
+++
tomcat/trunk/test/org/apache/coyote/http11/upgrade/TestUpgradeInternalHandler.java
Mon Dec 14 14:47:06 2015
@@ -245,7 +245,6 @@ public class TestUpgradeInternalHandler
case OPEN_WRITE:
break;
case STOP:
- case ASYNC_READ_ERROR:
case ASYNC_WRITE_ERROR:
case CLOSE_NOW:
case DISCONNECT:
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
