Author: markt
Date: Wed Dec 14 11:05:39 2016
New Revision: 1774181
URL: http://svn.apache.org/viewvc?rev=1774181&view=rev
Log:
Remove remaining references to endpoint from HttpProcessor
Modified:
tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java
tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java
Modified: tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java?rev=1774181&r1=1774180&r2=1774181&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java Wed Dec 14
11:05:39 2016
@@ -574,6 +574,11 @@ public abstract class AbstractProtocol<S
}
+ public boolean isPaused() {
+ return endpoint.isPaused();
+ }
+
+
@Override
public void resume() throws Exception {
if(getLog().isInfoEnabled()) {
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=1774181&r1=1774180&r2=1774181&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java Wed Dec 14
11:05:39 2016
@@ -371,7 +371,7 @@ public class Http11Processor extends Abs
boolean keptAlive = false;
while (!getErrorState().isError() && keepAlive && !isAsync() &&
- upgradeToken == null && !endpoint.isPaused()) {
+ upgradeToken == null && !protocol.isPaused()) {
// Parsing the request header
try {
@@ -383,7 +383,7 @@ public class Http11Processor extends Abs
}
}
- if (endpoint.isPaused()) {
+ if (protocol.isPaused()) {
// 503 - Service unavailable
response.setStatus(503);
setErrorState(ErrorState.CLOSE_CLEAN, null);
@@ -568,7 +568,7 @@ public class Http11Processor extends Abs
rp.setStage(org.apache.coyote.Constants.STAGE_ENDED);
- if (getErrorState().isError() || endpoint.isPaused()) {
+ if (getErrorState().isError() || protocol.isPaused()) {
return SocketState.CLOSED;
} else if (isAsync()) {
return SocketState.LONG;
@@ -613,7 +613,7 @@ public class Http11Processor extends Abs
// Check to see if we have read any of the request line yet
if (inputBuffer.getParsingRequestLinePhase() > 1) {
// Started to read request line.
- if (endpoint.isPaused()) {
+ if (protocol.isPaused()) {
// Partially processed the request so need to respond
response.setStatus(503);
setErrorState(ErrorState.CLOSE_CLEAN, null);
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
