Author: markt
Date: Mon Dec 14 13:50:25 2015
New Revision: 1719912
URL: http://svn.apache.org/viewvc?rev=1719912&view=rev
Log:
Rename SocketStatus to SocketEvent. It has needed a better name since creation
and the connector refactoring is a good point to do it.
Added:
tomcat/trunk/java/org/apache/tomcat/util/net/SocketEvent.java
- copied, changed from r1719889,
tomcat/trunk/java/org/apache/tomcat/util/net/SocketStatus.java
Removed:
tomcat/trunk/java/org/apache/tomcat/util/net/SocketStatus.java
Modified:
tomcat/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java
tomcat/trunk/java/org/apache/coyote/AbstractProcessor.java
tomcat/trunk/java/org/apache/coyote/AbstractProcessorLight.java
tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java
tomcat/trunk/java/org/apache/coyote/Adapter.java
tomcat/trunk/java/org/apache/coyote/Processor.java
tomcat/trunk/java/org/apache/coyote/ajp/AjpProcessor.java
tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java
tomcat/trunk/java/org/apache/coyote/http11/upgrade/InternalHttpUpgradeHandler.java
tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeProcessorExternal.java
tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeProcessorInternal.java
tomcat/trunk/java/org/apache/coyote/http2/Http2UpgradeHandler.java
tomcat/trunk/java/org/apache/coyote/http2/StreamProcessor.java
tomcat/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java
tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java
tomcat/trunk/java/org/apache/tomcat/util/net/DispatchType.java
tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java
tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java
tomcat/trunk/java/org/apache/tomcat/util/net/SecureNio2Channel.java
tomcat/trunk/java/org/apache/tomcat/util/net/SocketWrapperBase.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=1719912&r1=1719911&r2=1719912&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java Mon Dec
14 13:50:25 2015
@@ -50,7 +50,7 @@ import org.apache.tomcat.util.buf.Messag
import org.apache.tomcat.util.http.ServerCookie;
import org.apache.tomcat.util.http.ServerCookies;
import org.apache.tomcat.util.net.SSLSupport;
-import org.apache.tomcat.util.net.SocketStatus;
+import org.apache.tomcat.util.net.SocketEvent;
import org.apache.tomcat.util.res.StringManager;
@@ -127,7 +127,7 @@ public class CoyoteAdapter implements Ad
@Override
public boolean asyncDispatch(org.apache.coyote.Request req,
- org.apache.coyote.Response res, SocketStatus status) throws
Exception {
+ org.apache.coyote.Response res, SocketEvent status) throws
Exception {
Request request = (Request) req.getNote(ADAPTER_NOTES);
Response response = (Response) res.getNote(ADAPTER_NOTES);
@@ -153,11 +153,11 @@ public class CoyoteAdapter implements Ad
response.setSuspended(false);
}
- if (status==SocketStatus.TIMEOUT) {
+ if (status==SocketEvent.TIMEOUT) {
if (!asyncConImpl.timeout()) {
asyncConImpl.setErrorState(null, false);
}
- } else if (status==SocketStatus.ASYNC_READ_ERROR) {
+ } 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
@@ -178,7 +178,7 @@ public class CoyoteAdapter implements Ad
if (t != null) {
asyncConImpl.setErrorState(t, true);
}
- } else if (status==SocketStatus.ASYNC_WRITE_ERROR) {
+ } 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
// close
@@ -204,7 +204,7 @@ public class CoyoteAdapter implements Ad
if (!request.isAsyncDispatching() && request.isAsync()) {
WriteListener writeListener = res.getWriteListener();
ReadListener readListener = req.getReadListener();
- if (writeListener != null && status ==
SocketStatus.OPEN_WRITE) {
+ if (writeListener != null && status == SocketEvent.OPEN_WRITE)
{
ClassLoader oldCL = null;
try {
oldCL = request.getContext().bind(false, null);
@@ -220,7 +220,7 @@ public class CoyoteAdapter implements Ad
} finally {
request.getContext().unbind(false, oldCL);
}
- } else if (readListener != null && status ==
SocketStatus.OPEN_READ) {
+ } else if (readListener != null && status ==
SocketEvent.OPEN_READ) {
ClassLoader oldCL = null;
try {
oldCL = request.getContext().bind(false, null);
Modified: tomcat/trunk/java/org/apache/coyote/AbstractProcessor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/AbstractProcessor.java?rev=1719912&r1=1719911&r2=1719912&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/AbstractProcessor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/AbstractProcessor.java Mon Dec 14
13:50:25 2015
@@ -26,7 +26,7 @@ import org.apache.tomcat.util.ExceptionU
import org.apache.tomcat.util.net.AbstractEndpoint;
import org.apache.tomcat.util.net.AbstractEndpoint.Handler.SocketState;
import org.apache.tomcat.util.net.SSLSupport;
-import org.apache.tomcat.util.net.SocketStatus;
+import org.apache.tomcat.util.net.SocketEvent;
import org.apache.tomcat.util.net.SocketWrapperBase;
import org.apache.tomcat.util.res.StringManager;
@@ -97,7 +97,7 @@ public abstract class AbstractProcessor
response.setStatus(500);
}
getLog().info(sm.getString("abstractProcessor.nonContainerThreadError"), t);
- socketWrapper.processSocket(SocketStatus.CLOSE_NOW, true);
+ socketWrapper.processSocket(SocketEvent.CLOSE_NOW, true);
}
}
@@ -181,9 +181,9 @@ public abstract class AbstractProcessor
@Override
- public final SocketState dispatch(SocketStatus status) {
+ public final SocketState dispatch(SocketEvent status) {
- if (status == SocketStatus.OPEN_WRITE && response.getWriteListener()
!= null) {
+ if (status == SocketEvent.OPEN_WRITE && response.getWriteListener() !=
null) {
asyncStateMachine.asyncOperation();
try {
if (flushBufferedWrite()) {
@@ -193,10 +193,10 @@ public abstract class AbstractProcessor
if (getLog().isDebugEnabled()) {
getLog().debug("Unable to write async data.", ioe);
}
- status = SocketStatus.ASYNC_WRITE_ERROR;
+ status = SocketEvent.ASYNC_WRITE_ERROR;
request.setAttribute(RequestDispatcher.ERROR_EXCEPTION, ioe);
}
- } else if (status == SocketStatus.OPEN_READ &&
request.getReadListener() != null) {
+ } else if (status == SocketEvent.OPEN_READ &&
request.getReadListener() != null) {
dispatchNonBlockingRead();
}
@@ -256,7 +256,7 @@ public abstract class AbstractProcessor
private void doTimeoutAsync() {
// Avoid multiple timeouts
setAsyncTimeout(-1);
- socketWrapper.processSocket(SocketStatus.TIMEOUT, true);
+ socketWrapper.processSocket(SocketEvent.TIMEOUT, true);
}
Modified: tomcat/trunk/java/org/apache/coyote/AbstractProcessorLight.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/AbstractProcessorLight.java?rev=1719912&r1=1719911&r2=1719912&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/AbstractProcessorLight.java (original)
+++ tomcat/trunk/java/org/apache/coyote/AbstractProcessorLight.java Mon Dec 14
13:50:25 2015
@@ -24,7 +24,7 @@ import java.util.concurrent.CopyOnWriteA
import org.apache.juli.logging.Log;
import org.apache.tomcat.util.net.AbstractEndpoint.Handler.SocketState;
import org.apache.tomcat.util.net.DispatchType;
-import org.apache.tomcat.util.net.SocketStatus;
+import org.apache.tomcat.util.net.SocketEvent;
import org.apache.tomcat.util.net.SocketWrapperBase;
/**
@@ -38,19 +38,19 @@ public abstract class AbstractProcessorL
@Override
- public SocketState process(SocketWrapperBase<?> socketWrapper,
SocketStatus status)
+ public SocketState process(SocketWrapperBase<?> socketWrapper, SocketEvent
status)
throws IOException {
SocketState state = SocketState.CLOSED;
Iterator<DispatchType> dispatches = null;
do {
- if (status == SocketStatus.CLOSE_NOW) {
+ if (status == SocketEvent.CLOSE_NOW) {
errorDispatch();
state = SocketState.CLOSED;
} else if (dispatches != null) {
DispatchType nextDispatch = dispatches.next();
state = dispatch(nextDispatch.getSocketStatus());
- } else if (status == SocketStatus.DISCONNECT) {
+ } else if (status == SocketEvent.DISCONNECT) {
// Do nothing here, just wait for it to get recycled
} else if (isAsync() || isUpgrade() || state ==
SocketState.ASYNC_END) {
state = dispatch(status);
@@ -62,7 +62,7 @@ public abstract class AbstractProcessorL
// process it now.
state = service(socketWrapper);
}
- } else if (status == SocketStatus.OPEN_WRITE) {
+ } else if (status == SocketEvent.OPEN_WRITE) {
// Extra write event likely after async, ignore
state = SocketState.LONG;
} else {
@@ -130,7 +130,7 @@ public abstract class AbstractProcessorL
* or HTTP headers. Once the headers have been fully read this method is
not
* called again until there is a new HTTP request to process. Note that the
* request type may change during processing which may result in one or
more
- * calls to {@link #dispatch(SocketStatus)}. Requests may be pipe-lined.
+ * calls to {@link #dispatch(SocketEvent)}. Requests may be pipe-lined.
*
* @param socketWrapper The connection to process
*
@@ -148,7 +148,7 @@ public abstract class AbstractProcessorL
* Further uses may be added in the future. These will typically start as
* HTTP requests.
*/
- protected abstract SocketState dispatch(SocketStatus status);
+ protected abstract SocketState dispatch(SocketEvent status);
protected abstract SocketState asyncPostProcess();
Modified: tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java?rev=1719912&r1=1719911&r2=1719912&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java Mon Dec 14
13:50:25 2015
@@ -42,7 +42,7 @@ import org.apache.tomcat.util.collection
import org.apache.tomcat.util.modeler.Registry;
import org.apache.tomcat.util.net.AbstractEndpoint;
import org.apache.tomcat.util.net.AbstractEndpoint.Handler;
-import org.apache.tomcat.util.net.SocketStatus;
+import org.apache.tomcat.util.net.SocketEvent;
import org.apache.tomcat.util.net.SocketWrapperBase;
import org.apache.tomcat.util.res.StringManager;
@@ -691,7 +691,7 @@ public abstract class AbstractProtocol<S
@Override
- public SocketState process(SocketWrapperBase<S> wrapper, SocketStatus
status) {
+ public SocketState process(SocketWrapperBase<S> wrapper, SocketEvent
status) {
if (getLog().isDebugEnabled()) {
getLog().debug(sm.getString("abstractConnectionHandler.process",
wrapper.getSocket(), status));
@@ -708,7 +708,7 @@ public abstract class AbstractProtocol<S
}
Processor processor = connections.get(socket);
- if (status == SocketStatus.DISCONNECT && processor == null) {
+ if (status == SocketEvent.DISCONNECT && processor == null) {
// Nothing to do. Endpoint requested a close and there is no
// longer a processor associated with this socket.
return SocketState.CLOSED;
@@ -816,7 +816,7 @@ public abstract class AbstractProtocol<S
// multiple read events which may lead to thread starvation
// in the connector. The write() method will add this
socket
// to the poller if necessary.
- if (status != SocketStatus.OPEN_WRITE) {
+ if (status != SocketEvent.OPEN_WRITE) {
longPoll(wrapper, processor);
}
} else {
Modified: tomcat/trunk/java/org/apache/coyote/Adapter.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/Adapter.java?rev=1719912&r1=1719911&r2=1719912&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/Adapter.java (original)
+++ tomcat/trunk/java/org/apache/coyote/Adapter.java Mon Dec 14 13:50:25 2015
@@ -16,7 +16,7 @@
*/
package org.apache.coyote;
-import org.apache.tomcat.util.net.SocketStatus;
+import org.apache.tomcat.util.net.SocketEvent;
/**
* Adapter. This represents the entry point in a coyote-based servlet
container.
@@ -63,7 +63,7 @@ public interface Adapter {
*/
public boolean prepare(Request req, Response res) throws Exception;
- public boolean asyncDispatch(Request req,Response res, SocketStatus status)
+ public boolean asyncDispatch(Request req,Response res, SocketEvent status)
throws Exception;
public void errorDispatch(Request request, Response response);
Modified: tomcat/trunk/java/org/apache/coyote/Processor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/Processor.java?rev=1719912&r1=1719911&r2=1719912&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/Processor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/Processor.java Mon Dec 14 13:50:25 2015
@@ -21,7 +21,7 @@ import java.nio.ByteBuffer;
import org.apache.tomcat.util.net.AbstractEndpoint.Handler.SocketState;
import org.apache.tomcat.util.net.SSLSupport;
-import org.apache.tomcat.util.net.SocketStatus;
+import org.apache.tomcat.util.net.SocketEvent;
import org.apache.tomcat.util.net.SocketWrapperBase;
/**
@@ -44,7 +44,7 @@ public interface Processor {
* @throws IOException If an I/O error occurs during the processing of the
* request
*/
- SocketState process(SocketWrapperBase<?> socketWrapper, SocketStatus
status) throws IOException;
+ SocketState process(SocketWrapperBase<?> socketWrapper, SocketEvent
status) throws IOException;
UpgradeToken getUpgradeToken();
Modified: tomcat/trunk/java/org/apache/coyote/ajp/AjpProcessor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/ajp/AjpProcessor.java?rev=1719912&r1=1719911&r2=1719912&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/ajp/AjpProcessor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/ajp/AjpProcessor.java Mon Dec 14
13:50:25 2015
@@ -48,7 +48,7 @@ import org.apache.tomcat.util.net.Abstra
import org.apache.tomcat.util.net.AbstractEndpoint.Handler.SocketState;
import org.apache.tomcat.util.net.DispatchType;
import org.apache.tomcat.util.net.SSLSupport;
-import org.apache.tomcat.util.net.SocketStatus;
+import org.apache.tomcat.util.net.SocketEvent;
import org.apache.tomcat.util.net.SocketWrapperBase;
import org.apache.tomcat.util.res.StringManager;
@@ -493,13 +493,13 @@ public class AjpProcessor extends Abstra
case ASYNC_COMPLETE: {
clearDispatches();
if (asyncStateMachine.asyncComplete()) {
- socketWrapper.processSocket(SocketStatus.OPEN_READ, true);
+ socketWrapper.processSocket(SocketEvent.OPEN_READ, true);
}
break;
}
case ASYNC_DISPATCH: {
if (asyncStateMachine.asyncDispatch()) {
- socketWrapper.processSocket(SocketStatus.OPEN_READ, true);
+ socketWrapper.processSocket(SocketEvent.OPEN_READ, true);
}
break;
}
Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java?rev=1719912&r1=1719911&r2=1719912&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java Mon Dec 14
13:50:25 2015
@@ -61,7 +61,7 @@ import org.apache.tomcat.util.net.Abstra
import org.apache.tomcat.util.net.DispatchType;
import org.apache.tomcat.util.net.SSLSupport;
import org.apache.tomcat.util.net.SendfileDataBase;
-import org.apache.tomcat.util.net.SocketStatus;
+import org.apache.tomcat.util.net.SocketEvent;
import org.apache.tomcat.util.net.SocketWrapperBase;
import org.apache.tomcat.util.res.StringManager;
@@ -758,7 +758,7 @@ public class Http11Processor extends Abs
case ASYNC_COMPLETE: {
clearDispatches();
if (asyncStateMachine.asyncComplete()) {
- socketWrapper.processSocket(SocketStatus.OPEN_READ, true);
+ socketWrapper.processSocket(SocketEvent.OPEN_READ, true);
}
break;
}
@@ -772,7 +772,7 @@ public class Http11Processor extends Abs
}
case ASYNC_DISPATCH: {
if (asyncStateMachine.asyncDispatch()) {
- socketWrapper.processSocket(SocketStatus.OPEN_READ, true);
+ socketWrapper.processSocket(SocketEvent.OPEN_READ, true);
}
break;
}
Modified:
tomcat/trunk/java/org/apache/coyote/http11/upgrade/InternalHttpUpgradeHandler.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/upgrade/InternalHttpUpgradeHandler.java?rev=1719912&r1=1719911&r2=1719912&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/coyote/http11/upgrade/InternalHttpUpgradeHandler.java
(original)
+++
tomcat/trunk/java/org/apache/coyote/http11/upgrade/InternalHttpUpgradeHandler.java
Mon Dec 14 13:50:25 2015
@@ -20,7 +20,7 @@ import javax.servlet.http.HttpUpgradeHan
import org.apache.tomcat.util.net.AbstractEndpoint.Handler.SocketState;
import org.apache.tomcat.util.net.SSLSupport;
-import org.apache.tomcat.util.net.SocketStatus;
+import org.apache.tomcat.util.net.SocketEvent;
import org.apache.tomcat.util.net.SocketWrapperBase;
@@ -30,7 +30,7 @@ import org.apache.tomcat.util.net.Socket
*/
public interface InternalHttpUpgradeHandler extends HttpUpgradeHandler {
- SocketState upgradeDispatch(SocketStatus status);
+ SocketState upgradeDispatch(SocketEvent status);
void setSocketWrapper(SocketWrapperBase<?> wrapper);
Modified:
tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeProcessorExternal.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeProcessorExternal.java?rev=1719912&r1=1719911&r2=1719912&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeProcessorExternal.java
(original)
+++
tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeProcessorExternal.java
Mon Dec 14 13:50:25 2015
@@ -27,7 +27,7 @@ import org.apache.juli.logging.Log;
import org.apache.juli.logging.LogFactory;
import org.apache.tomcat.util.net.AbstractEndpoint.Handler.SocketState;
import org.apache.tomcat.util.net.SSLSupport;
-import org.apache.tomcat.util.net.SocketStatus;
+import org.apache.tomcat.util.net.SocketEvent;
import org.apache.tomcat.util.net.SocketWrapperBase;
import org.apache.tomcat.util.res.StringManager;
@@ -86,12 +86,12 @@ public class UpgradeProcessorExternal ex
// ------------------------------------------- Implemented Processor
methods
@Override
- public final SocketState dispatch(SocketStatus status) {
- if (status == SocketStatus.OPEN_READ) {
+ public final SocketState dispatch(SocketEvent status) {
+ if (status == SocketEvent.OPEN_READ) {
upgradeServletInputStream.onDataAvailable();
- } else if (status == SocketStatus.OPEN_WRITE) {
+ } else if (status == SocketEvent.OPEN_WRITE) {
upgradeServletOutputStream.onWritePossible();
- } else if (status == SocketStatus.STOP) {
+ } else if (status == SocketEvent.STOP) {
if (log.isDebugEnabled()) {
log.debug(sm.getString("upgradeProcessor.stop"));
}
Modified:
tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeProcessorInternal.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeProcessorInternal.java?rev=1719912&r1=1719911&r2=1719912&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeProcessorInternal.java
(original)
+++
tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeProcessorInternal.java
Mon Dec 14 13:50:25 2015
@@ -27,7 +27,7 @@ import org.apache.juli.logging.Log;
import org.apache.juli.logging.LogFactory;
import org.apache.tomcat.util.net.AbstractEndpoint.Handler.SocketState;
import org.apache.tomcat.util.net.SSLSupport;
-import org.apache.tomcat.util.net.SocketStatus;
+import org.apache.tomcat.util.net.SocketEvent;
import org.apache.tomcat.util.net.SocketWrapperBase;
public class UpgradeProcessorInternal extends UpgradeProcessorBase {
@@ -51,7 +51,7 @@ public class UpgradeProcessorInternal ex
@Override
- public SocketState dispatch(SocketStatus status) {
+ public SocketState dispatch(SocketEvent status) {
return internalHttpUpgradeHandler.upgradeDispatch(status);
}
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=1719912&r1=1719911&r2=1719912&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http2/Http2UpgradeHandler.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http2/Http2UpgradeHandler.java Mon Dec
14 13:50:25 2015
@@ -51,7 +51,7 @@ import org.apache.tomcat.util.http.FastH
import org.apache.tomcat.util.http.MimeHeaders;
import org.apache.tomcat.util.net.AbstractEndpoint.Handler.SocketState;
import org.apache.tomcat.util.net.SSLSupport;
-import org.apache.tomcat.util.net.SocketStatus;
+import org.apache.tomcat.util.net.SocketEvent;
import org.apache.tomcat.util.net.SocketWrapperBase;
import org.apache.tomcat.util.res.StringManager;
@@ -264,7 +264,7 @@ public class Http2UpgradeHandler extends
@Override
- public SocketState upgradeDispatch(SocketStatus status) {
+ public SocketState upgradeDispatch(SocketEvent status) {
if (log.isDebugEnabled()) {
log.debug(sm.getString("upgradeHandler.upgradeDispatch.entry",
connectionId, status));
}
Modified: tomcat/trunk/java/org/apache/coyote/http2/StreamProcessor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http2/StreamProcessor.java?rev=1719912&r1=1719911&r2=1719912&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http2/StreamProcessor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http2/StreamProcessor.java Mon Dec 14
13:50:25 2015
@@ -34,7 +34,7 @@ import org.apache.tomcat.util.buf.ByteCh
import org.apache.tomcat.util.net.AbstractEndpoint.Handler.SocketState;
import org.apache.tomcat.util.net.DispatchType;
import org.apache.tomcat.util.net.SSLSupport;
-import org.apache.tomcat.util.net.SocketStatus;
+import org.apache.tomcat.util.net.SocketEvent;
import org.apache.tomcat.util.net.SocketWrapperBase;
import org.apache.tomcat.util.res.StringManager;
@@ -63,7 +63,7 @@ public class StreamProcessor extends Abs
ContainerThreadMarker.set();
SocketState state = SocketState.CLOSED;
try {
- state = process(socketWrapper, SocketStatus.OPEN_READ);
+ state = process(socketWrapper, SocketEvent.OPEN_READ);
if (state == SocketState.CLOSED) {
if (!getErrorState().isConnectionIoAllowed()) {
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java?rev=1719912&r1=1719911&r2=1719912&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java Mon Dec
14 13:50:25 2015
@@ -71,7 +71,7 @@ public abstract class AbstractEndpoint<S
* @return The state of the socket after processing
*/
public SocketState process(SocketWrapperBase<S> socket,
- SocketStatus status);
+ SocketEvent status);
/**
@@ -768,7 +768,7 @@ public abstract class AbstractEndpoint<S
* container thread
*/
public abstract void processSocket(SocketWrapperBase<S> socketWrapper,
- SocketStatus socketStatus, boolean dispatch);
+ SocketEvent socketStatus, boolean dispatch);
// ------------------------------------------------------- Lifecycle
methods
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=1719912&r1=1719911&r2=1719912&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java Mon Dec 14
13:50:25 2015
@@ -824,7 +824,7 @@ public class AprEndpoint extends Abstrac
* <code>false</code> which indicates an error occurred and that
the
* socket should be closed
*/
- public boolean processSocket(long socket, SocketStatus status) {
+ public boolean processSocket(long socket, SocketEvent status) {
try {
Executor executor = getExecutor();
if (executor == null) {
@@ -853,7 +853,7 @@ public class AprEndpoint extends Abstrac
@Override
- public void processSocket(SocketWrapperBase<Long> socket, SocketStatus
status,
+ public void processSocket(SocketWrapperBase<Long> socket, SocketEvent
status,
boolean dispatch) {
try {
// Synchronisation is required here as this code may be called as a
@@ -1720,27 +1720,27 @@ public class AprEndpoint extends Abstrac
// was registered for
if ((desc[n*2] & Poll.APR_POLLIN) ==
Poll.APR_POLLIN) {
// Error probably occurred during a
non-blocking read
- if (!processSocket(desc[n*2+1],
SocketStatus.OPEN_READ)) {
+ if (!processSocket(desc[n*2+1],
SocketEvent.OPEN_READ)) {
// Close socket and clear pool
closeSocket(desc[n*2+1]);
}
} else if ((desc[n*2] & Poll.APR_POLLOUT)
== Poll.APR_POLLOUT) {
// Error probably occurred during a
non-blocking write
- if (!processSocket(desc[n*2+1],
SocketStatus.OPEN_WRITE)) {
+ if (!processSocket(desc[n*2+1],
SocketEvent.OPEN_WRITE)) {
// Close socket and clear pool
closeSocket(desc[n*2+1]);
}
} else if ((wrapper.pollerFlags &
Poll.APR_POLLIN) == Poll.APR_POLLIN) {
// Can't tell what was happening when
the error occurred but the
// socket is registered for
non-blocking read so use that
- if (!processSocket(desc[n*2+1],
SocketStatus.OPEN_READ)) {
+ if (!processSocket(desc[n*2+1],
SocketEvent.OPEN_READ)) {
// Close socket and clear pool
closeSocket(desc[n*2+1]);
}
} else if ((wrapper.pollerFlags &
Poll.APR_POLLOUT) == Poll.APR_POLLOUT) {
// Can't tell what was happening when
the error occurred but the
// socket is registered for
non-blocking write so use that
- if (!processSocket(desc[n*2+1],
SocketStatus.OPEN_WRITE)) {
+ if (!processSocket(desc[n*2+1],
SocketEvent.OPEN_WRITE)) {
// Close socket and clear pool
closeSocket(desc[n*2+1]);
}
@@ -1752,14 +1752,14 @@ public class AprEndpoint extends Abstrac
|| ((desc[n*2] & Poll.APR_POLLOUT) ==
Poll.APR_POLLOUT)) {
boolean error = false;
if (((desc[n*2] & Poll.APR_POLLIN) ==
Poll.APR_POLLIN) &&
- !processSocket(desc[n*2+1],
SocketStatus.OPEN_READ)) {
+ !processSocket(desc[n*2+1],
SocketEvent.OPEN_READ)) {
error = true;
// Close socket and clear pool
closeSocket(desc[n*2+1]);
}
if (!error &&
((desc[n*2] & Poll.APR_POLLOUT) ==
Poll.APR_POLLOUT) &&
- !processSocket(desc[n*2+1],
SocketStatus.OPEN_WRITE)) {
+ !processSocket(desc[n*2+1],
SocketEvent.OPEN_WRITE)) {
// Close socket and clear pool
error = true;
closeSocket(desc[n*2+1]);
@@ -2245,7 +2245,7 @@ public class AprEndpoint extends Abstrac
}
// Process the request from this socket
Handler.SocketState state = getHandler().process(socket,
- SocketStatus.OPEN_READ);
+ SocketEvent.OPEN_READ);
if (state == Handler.SocketState.CLOSED) {
// Close socket and pool
closeSocket(socket.getSocket().longValue());
@@ -2267,10 +2267,10 @@ public class AprEndpoint extends Abstrac
protected class SocketProcessor implements Runnable {
private final SocketWrapperBase<Long> socket;
- private final SocketStatus status;
+ private final SocketEvent status;
public SocketProcessor(SocketWrapperBase<Long> socket,
- SocketStatus status) {
+ SocketEvent status) {
this.socket = socket;
if (status == null) {
// Should never happen
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/DispatchType.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/DispatchType.java?rev=1719912&r1=1719911&r2=1719912&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/DispatchType.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/DispatchType.java Mon Dec 14
13:50:25 2015
@@ -23,16 +23,16 @@ package org.apache.tomcat.util.net;
*/
public enum DispatchType {
- NON_BLOCKING_READ(SocketStatus.OPEN_READ),
- NON_BLOCKING_WRITE(SocketStatus.OPEN_WRITE);
+ NON_BLOCKING_READ(SocketEvent.OPEN_READ),
+ NON_BLOCKING_WRITE(SocketEvent.OPEN_WRITE);
- private final SocketStatus status;
+ private final SocketEvent status;
- private DispatchType(SocketStatus status) {
+ private DispatchType(SocketEvent status) {
this.status = status;
}
- public SocketStatus getSocketStatus() {
+ public SocketEvent getSocketStatus() {
return status;
}
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java?rev=1719912&r1=1719911&r2=1719912&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java Mon Dec 14
13:50:25 2015
@@ -354,7 +354,7 @@ public class Nio2Endpoint extends Abstra
socketWrapper.setReadTimeout(getSoTimeout());
socketWrapper.setWriteTimeout(getSoTimeout());
// Continue processing on another thread
- return processSocket0(socketWrapper, SocketStatus.OPEN_READ, true);
+ return processSocket0(socketWrapper, SocketEvent.OPEN_READ, true);
} catch (Throwable t) {
ExceptionUtils.handleThrowable(t);
log.error("",t);
@@ -374,11 +374,11 @@ public class Nio2Endpoint extends Abstra
@Override
public void processSocket(SocketWrapperBase<Nio2Channel> socketWrapper,
- SocketStatus socketStatus, boolean dispatch) {
+ SocketEvent socketStatus, boolean dispatch) {
processSocket0(socketWrapper, socketStatus, dispatch);
}
- protected boolean processSocket0(SocketWrapperBase<Nio2Channel>
socketWrapper, SocketStatus status, boolean dispatch) {
+ protected boolean processSocket0(SocketWrapperBase<Nio2Channel>
socketWrapper, SocketEvent status, boolean dispatch) {
try {
SocketProcessor sc = processorCache.pop();
if (sc == null) {
@@ -574,12 +574,12 @@ public class Nio2Endpoint extends Abstra
failed(new ClosedChannelException(), attachment);
return;
}
- getEndpoint().processSocket(attachment,
SocketStatus.OPEN_READ, Nio2Endpoint.isInline());
+ getEndpoint().processSocket(attachment, SocketEvent.OPEN_READ,
Nio2Endpoint.isInline());
}
@Override
public void failed(Throwable exc, SocketWrapperBase<Nio2Channel>
attachment) {
- getEndpoint().processSocket(attachment,
SocketStatus.DISCONNECT, true);
+ getEndpoint().processSocket(attachment,
SocketEvent.DISCONNECT, true);
}
};
@@ -611,7 +611,7 @@ public class Nio2Endpoint extends Abstra
}
} else {
if (!isInline()) {
-
getEndpoint().processSocket(Nio2SocketWrapper.this, SocketStatus.DISCONNECT,
false);
+
getEndpoint().processSocket(Nio2SocketWrapper.this, SocketEvent.DISCONNECT,
false);
} else {
attachment.doneInline = true;
}
@@ -649,7 +649,7 @@ public class Nio2Endpoint extends Abstra
// Ignore
}
if (!isInline()) {
- getEndpoint().processSocket(Nio2SocketWrapper.this,
SocketStatus.ERROR, false);
+ getEndpoint().processSocket(Nio2SocketWrapper.this,
SocketEvent.ERROR, false);
} else {
attachment.doneInline = true;
attachment.error = true;
@@ -683,7 +683,7 @@ public class Nio2Endpoint extends Abstra
}
}
if (notify) {
- getEndpoint().processSocket(attachment,
SocketStatus.OPEN_READ, false);
+ getEndpoint().processSocket(attachment,
SocketEvent.OPEN_READ, false);
}
}
@Override
@@ -702,7 +702,7 @@ public class Nio2Endpoint extends Abstra
// If already closed, don't call onError and close
again
return;
}
- getEndpoint().processSocket(attachment,
SocketStatus.ERROR, true);
+ getEndpoint().processSocket(attachment, SocketEvent.ERROR,
true);
}
};
@@ -747,7 +747,7 @@ public class Nio2Endpoint extends Abstra
}
}
if (writeNotify && nestedWriteCompletionCount.get().get()
== 0) {
- endpoint.processSocket(Nio2SocketWrapper.this,
SocketStatus.OPEN_WRITE, Nio2Endpoint.isInline());
+ endpoint.processSocket(Nio2SocketWrapper.this,
SocketEvent.OPEN_WRITE, Nio2Endpoint.isInline());
}
}
@@ -761,7 +761,7 @@ public class Nio2Endpoint extends Abstra
}
Nio2SocketWrapper.this.setError(ioe);
writePending.release();
- endpoint.processSocket(Nio2SocketWrapper.this,
SocketStatus.OPEN_WRITE, true);
+ endpoint.processSocket(Nio2SocketWrapper.this,
SocketEvent.OPEN_WRITE, true);
}
};
@@ -801,7 +801,7 @@ public class Nio2Endpoint extends Abstra
}
}
if (writeNotify && nestedWriteCompletionCount.get().get()
== 0) {
- endpoint.processSocket(Nio2SocketWrapper.this,
SocketStatus.OPEN_WRITE, Nio2Endpoint.isInline());
+ endpoint.processSocket(Nio2SocketWrapper.this,
SocketEvent.OPEN_WRITE, Nio2Endpoint.isInline());
}
}
@@ -815,7 +815,7 @@ public class Nio2Endpoint extends Abstra
}
Nio2SocketWrapper.this.setError(ioe);
writePending.release();
- endpoint.processSocket(Nio2SocketWrapper.this,
SocketStatus.OPEN_WRITE, true);
+ endpoint.processSocket(Nio2SocketWrapper.this,
SocketEvent.OPEN_WRITE, true);
}
};
@@ -1368,7 +1368,7 @@ public class Nio2Endpoint extends Abstra
writeInterest = true;
} else {
// If no write is pending, notify
- getEndpoint().processSocket(this, SocketStatus.OPEN_WRITE,
true);
+ getEndpoint().processSocket(this, SocketEvent.OPEN_WRITE,
true);
}
}
}
@@ -1607,13 +1607,13 @@ public class Nio2Endpoint extends Abstra
protected class SocketProcessor implements Runnable {
private SocketWrapperBase<Nio2Channel> socket = null;
- private SocketStatus status = null;
+ private SocketEvent status = null;
- public SocketProcessor(SocketWrapperBase<Nio2Channel> socket,
SocketStatus status) {
+ public SocketProcessor(SocketWrapperBase<Nio2Channel> socket,
SocketEvent status) {
reset(socket,status);
}
- public void reset(SocketWrapperBase<Nio2Channel> socket, SocketStatus
status) {
+ public void reset(SocketWrapperBase<Nio2Channel> socket, SocketEvent
status) {
this.socket = socket;
this.status = status;
}
@@ -1621,7 +1621,7 @@ public class Nio2Endpoint extends Abstra
@Override
public void run() {
synchronized (socket) {
- if (SocketStatus.OPEN_WRITE != status) {
+ if (SocketEvent.OPEN_WRITE != status) {
// Anything other than OPEN_WRITE is a genuine read or an
// error condition so for all of those release the
semaphore
((Nio2SocketWrapper) socket).releaseReadPending();
@@ -1635,9 +1635,9 @@ public class Nio2Endpoint extends Abstra
// For STOP there is no point trying to handshake
as the
// Poller has been stopped.
if (socket.getSocket().isHandshakeComplete() ||
- status == SocketStatus.STOP) {
+ status == SocketEvent.STOP) {
handshake = 0;
- } else if (status == SocketStatus.ERROR) {
+ } else if (status == SocketEvent.ERROR) {
handshake = -1;
} else {
handshake = socket.getSocket().handshake();
@@ -1648,7 +1648,7 @@ public class Nio2Endpoint extends Abstra
// must always be OPEN_READ after it
completes. It
// is OK to always set this as it is only used
if
// the handshake completes.
- status = SocketStatus.OPEN_READ;
+ status = SocketEvent.OPEN_READ;
}
}
} catch (IOException x) {
@@ -1657,11 +1657,11 @@ public class Nio2Endpoint extends Abstra
log.debug(sm.getString("endpoint.err.handshake"),
x);
}
}
- if (handshake == 0 || status == SocketStatus.ERROR) {
+ if (handshake == 0 || status == SocketEvent.ERROR) {
SocketState state = SocketState.OPEN;
// Process the request from this socket
if (status == null) {
- state = getHandler().process(socket,
SocketStatus.OPEN_READ);
+ state = getHandler().process(socket,
SocketEvent.OPEN_READ);
} else {
state = getHandler().process(socket, status);
}
@@ -1695,7 +1695,7 @@ public class Nio2Endpoint extends Abstra
} finally {
if (launch) {
try {
- getExecutor().execute(new SocketProcessor(socket,
SocketStatus.OPEN_READ));
+ getExecutor().execute(new SocketProcessor(socket,
SocketEvent.OPEN_READ));
} catch (NullPointerException npe) {
if (running) {
log.error(sm.getString("endpoint.launch.fail"),
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=1719912&r1=1719911&r2=1719912&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java Mon Dec 14
13:50:25 2015
@@ -432,11 +432,11 @@ public class NioEndpoint extends Abstrac
@Override
public void processSocket(SocketWrapperBase<NioChannel> socketWrapper,
- SocketStatus socketStatus, boolean dispatch) {
+ SocketEvent socketStatus, boolean dispatch) {
processSocket((NioSocketWrapper) socketWrapper, socketStatus,
dispatch);
}
- protected boolean processSocket(NioSocketWrapper attachment, SocketStatus
status, boolean dispatch) {
+ protected boolean processSocket(NioSocketWrapper attachment, SocketEvent
status, boolean dispatch) {
try {
if (attachment == null) {
return false;
@@ -707,7 +707,7 @@ public class NioEndpoint extends Abstrac
addEvent(r);
if (close) {
NioEndpoint.NioSocketWrapper ka =
(NioEndpoint.NioSocketWrapper)socket.getAttachment();
- processSocket(ka, SocketStatus.STOP, false);
+ processSocket(ka, SocketEvent.STOP, false);
}
}
@@ -903,12 +903,12 @@ public class NioEndpoint extends Abstrac
boolean closeSocket = false;
// Read goes before write
if (sk.isReadable()) {
- if (!processSocket(attachment,
SocketStatus.OPEN_READ, true)) {
+ if (!processSocket(attachment,
SocketEvent.OPEN_READ, true)) {
closeSocket = true;
}
}
if (!closeSocket && sk.isWritable()) {
- if (!processSocket(attachment,
SocketStatus.OPEN_WRITE, true)) {
+ if (!processSocket(attachment,
SocketEvent.OPEN_WRITE, true)) {
closeSocket = true;
}
}
@@ -1461,13 +1461,13 @@ public class NioEndpoint extends Abstrac
protected class SocketProcessor implements Runnable {
private NioSocketWrapper ka = null;
- private SocketStatus status = null;
+ private SocketEvent status = null;
- public SocketProcessor(NioSocketWrapper ka, SocketStatus status) {
+ public SocketProcessor(NioSocketWrapper ka, SocketEvent status) {
reset(ka, status);
}
- public void reset(NioSocketWrapper ka, SocketStatus status) {
+ public void reset(NioSocketWrapper ka, SocketEvent status) {
this.ka = ka;
this.status = status;
}
@@ -1490,7 +1490,7 @@ public class NioEndpoint extends Abstrac
// For STOP there is no point trying to handshake
as the
// Poller has been stopped.
if (socket.isHandshakeComplete() ||
- status == SocketStatus.STOP) {
+ status == SocketEvent.STOP) {
handshake = 0;
} else {
handshake = socket.handshake(
@@ -1502,7 +1502,7 @@ public class NioEndpoint extends Abstrac
// must always be OPEN_READ after it
completes. It
// is OK to always set this as it is only used
if
// the handshake completes.
- status = SocketStatus.OPEN_READ;
+ status = SocketEvent.OPEN_READ;
}
}
} catch (IOException x) {
@@ -1515,7 +1515,7 @@ public class NioEndpoint extends Abstrac
SocketState state = SocketState.OPEN;
// Process the request from this socket
if (status == null) {
- state = getHandler().process(ka,
SocketStatus.OPEN_READ);
+ state = getHandler().process(ka,
SocketEvent.OPEN_READ);
} else {
state = getHandler().process(ka, status);
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/SecureNio2Channel.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/SecureNio2Channel.java?rev=1719912&r1=1719911&r2=1719912&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/SecureNio2Channel.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/SecureNio2Channel.java Mon Dec
14 13:50:25 2015
@@ -95,12 +95,12 @@ public class SecureNio2Channel extends N
if (result.intValue() < 0) {
failed(new EOFException(), attachment);
} else {
- endpoint.processSocket(attachment, SocketStatus.OPEN_READ,
false);
+ endpoint.processSocket(attachment, SocketEvent.OPEN_READ,
false);
}
}
@Override
public void failed(Throwable exc, SocketWrapperBase<Nio2Channel>
attachment) {
- endpoint.processSocket(attachment, SocketStatus.ERROR, false);
+ endpoint.processSocket(attachment, SocketEvent.ERROR, false);
}
}
@@ -112,12 +112,12 @@ public class SecureNio2Channel extends N
if (result.intValue() < 0) {
failed(new EOFException(), attachment);
} else {
- endpoint.processSocket(attachment, SocketStatus.OPEN_WRITE,
false);
+ endpoint.processSocket(attachment, SocketEvent.OPEN_WRITE,
false);
}
}
@Override
public void failed(Throwable exc, SocketWrapperBase<Nio2Channel>
attachment) {
- endpoint.processSocket(attachment, SocketStatus.ERROR, false);
+ endpoint.processSocket(attachment, SocketEvent.ERROR, false);
}
}
Copied: tomcat/trunk/java/org/apache/tomcat/util/net/SocketEvent.java (from
r1719889, tomcat/trunk/java/org/apache/tomcat/util/net/SocketStatus.java)
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/SocketEvent.java?p2=tomcat/trunk/java/org/apache/tomcat/util/net/SocketEvent.java&p1=tomcat/trunk/java/org/apache/tomcat/util/net/SocketStatus.java&r1=1719889&r2=1719912&rev=1719912&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/SocketStatus.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/SocketEvent.java Mon Dec 14
13:50:25 2015
@@ -14,14 +14,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.tomcat.util.net;
/**
- * Someone, please change the enum name.
- *
- * @author remm
+ * Defines events that occur per socket that require further processing by the
+ * container. Usually these events are triggered by the socket implementation
+ * but they may be triggered by the container.
*/
-public enum SocketStatus {
+public enum SocketEvent {
OPEN_READ, OPEN_WRITE, STOP, TIMEOUT, DISCONNECT, ERROR,
ASYNC_WRITE_ERROR, ASYNC_READ_ERROR, CLOSE_NOW
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/SocketWrapperBase.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/SocketWrapperBase.java?rev=1719912&r1=1719911&r2=1719912&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/SocketWrapperBase.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/SocketWrapperBase.java Mon Dec
14 13:50:25 2015
@@ -501,7 +501,7 @@ public abstract class SocketWrapperBase<
}
- public void processSocket(SocketStatus socketStatus, boolean dispatch) {
+ public void processSocket(SocketEvent socketStatus, boolean dispatch) {
endpoint.processSocket(this, socketStatus, dispatch);
}
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=1719912&r1=1719911&r2=1719912&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 13:50:25 2015
@@ -35,7 +35,7 @@ import org.apache.juli.logging.Log;
import org.apache.juli.logging.LogFactory;
import org.apache.tomcat.util.net.AbstractEndpoint.Handler.SocketState;
import org.apache.tomcat.util.net.SSLSupport;
-import org.apache.tomcat.util.net.SocketStatus;
+import org.apache.tomcat.util.net.SocketEvent;
import org.apache.tomcat.util.net.SocketWrapperBase;
import org.apache.tomcat.util.res.StringManager;
import org.apache.tomcat.websocket.Transformation;
@@ -141,7 +141,7 @@ public class WsHttpUpgradeHandler implem
@Override
- public SocketState upgradeDispatch(SocketStatus status) {
+ public SocketState upgradeDispatch(SocketEvent status) {
switch (status) {
case OPEN_READ:
try {
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=1719912&r1=1719911&r2=1719912&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 13:50:25 2015
@@ -48,7 +48,7 @@ import org.apache.catalina.startup.Tomca
import org.apache.catalina.startup.TomcatBaseTest;
import org.apache.tomcat.util.net.AbstractEndpoint.Handler.SocketState;
import org.apache.tomcat.util.net.SSLSupport;
-import org.apache.tomcat.util.net.SocketStatus;
+import org.apache.tomcat.util.net.SocketEvent;
import org.apache.tomcat.util.net.SocketWrapperBase;
import org.apache.tomcat.util.net.SocketWrapperBase.CompletionState;
@@ -236,7 +236,7 @@ public class TestUpgradeInternalHandler
}
@Override
- public SocketState upgradeDispatch(SocketStatus status) {
+ public SocketState upgradeDispatch(SocketEvent status) {
System.out.println("Processing: " + status);
switch (status) {
case OPEN_READ:
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
