You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2012/08/16 22:21:49 UTC
svn commit: r1374037 - in /tomcat/trunk/java/org/apache/coyote: ajp/ http11/
spdy/
Author: markt
Date: Thu Aug 16 20:21:48 2012
New Revision: 1374037
URL: http://svn.apache.org/viewvc?rev=1374037&view=rev
Log:
Use the getter
Modified:
tomcat/trunk/java/org/apache/coyote/ajp/AbstractAjpProcessor.java
tomcat/trunk/java/org/apache/coyote/ajp/AjpAprProcessor.java
tomcat/trunk/java/org/apache/coyote/ajp/AjpNioProcessor.java
tomcat/trunk/java/org/apache/coyote/ajp/AjpProcessor.java
tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java
tomcat/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java
tomcat/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java
tomcat/trunk/java/org/apache/coyote/spdy/SpdyProcessor.java
Modified: tomcat/trunk/java/org/apache/coyote/ajp/AbstractAjpProcessor.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/ajp/AbstractAjpProcessor.java?rev=1374037&r1=1374036&r2=1374037&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/ajp/AbstractAjpProcessor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/ajp/AbstractAjpProcessor.java Thu Aug 16 20:21:48 2012
@@ -474,7 +474,7 @@ public abstract class AbstractAjpProcess
RequestInfo rp = request.getRequestProcessor();
try {
rp.setStage(org.apache.coyote.Constants.STAGE_SERVICE);
- error = !adapter.asyncDispatch(request, response, status);
+ error = !getAdapter().asyncDispatch(request, response, status);
} catch (InterruptedIOException e) {
error = true;
} catch (Throwable t) {
@@ -485,7 +485,7 @@ public abstract class AbstractAjpProcess
if (error) {
// 500 - Internal Server Error
response.setStatus(500);
- adapter.log(request, response, 0);
+ getAdapter().log(request, response, 0);
}
}
@@ -852,7 +852,7 @@ public abstract class AbstractAjpProcess
parseHost(valueMB);
if (error) {
- adapter.log(request, response, 0);
+ getAdapter().log(request, response, 0);
}
}
Modified: tomcat/trunk/java/org/apache/coyote/ajp/AjpAprProcessor.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/ajp/AjpAprProcessor.java?rev=1374037&r1=1374036&r2=1374037&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/ajp/AjpAprProcessor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/ajp/AjpAprProcessor.java Thu Aug 16 20:21:48 2012
@@ -163,7 +163,7 @@ public class AjpAprProcessor extends Abs
log.debug(sm.getString("ajpprocessor.header.error"), t);
// 400 - Bad Request
response.setStatus(400);
- adapter.log(request, response, 0);
+ getAdapter().log(request, response, 0);
error = true;
}
@@ -177,7 +177,7 @@ public class AjpAprProcessor extends Abs
log.debug(sm.getString("ajpprocessor.request.prepare"), t);
// 400 - Internal Server Error
response.setStatus(400);
- adapter.log(request, response, 0);
+ getAdapter().log(request, response, 0);
error = true;
}
}
@@ -185,7 +185,7 @@ public class AjpAprProcessor extends Abs
if (!error && !cping && endpoint.isPaused()) {
// 503 - Service unavailable
response.setStatus(503);
- adapter.log(request, response, 0);
+ getAdapter().log(request, response, 0);
error = true;
}
cping = false;
@@ -194,7 +194,7 @@ public class AjpAprProcessor extends Abs
if (!error) {
try {
rp.setStage(org.apache.coyote.Constants.STAGE_SERVICE);
- adapter.service(request, response);
+ getAdapter().service(request, response);
} catch (InterruptedIOException e) {
error = true;
} catch (Throwable t) {
@@ -202,7 +202,7 @@ public class AjpAprProcessor extends Abs
log.error(sm.getString("ajpprocessor.request.process"), t);
// 500 - Internal Server Error
response.setStatus(500);
- adapter.log(request, response, 0);
+ getAdapter().log(request, response, 0);
error = true;
}
}
Modified: tomcat/trunk/java/org/apache/coyote/ajp/AjpNioProcessor.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/ajp/AjpNioProcessor.java?rev=1374037&r1=1374036&r2=1374037&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/ajp/AjpNioProcessor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/ajp/AjpNioProcessor.java Thu Aug 16 20:21:48 2012
@@ -150,7 +150,7 @@ public class AjpNioProcessor extends Abs
log.debug(sm.getString("ajpprocessor.header.error"), t);
// 400 - Bad Request
response.setStatus(400);
- adapter.log(request, response, 0);
+ getAdapter().log(request, response, 0);
error = true;
}
@@ -164,7 +164,7 @@ public class AjpNioProcessor extends Abs
log.debug(sm.getString("ajpprocessor.request.prepare"), t);
// 400 - Internal Server Error
response.setStatus(400);
- adapter.log(request, response, 0);
+ getAdapter().log(request, response, 0);
error = true;
}
}
@@ -172,7 +172,7 @@ public class AjpNioProcessor extends Abs
if (!error && !cping && endpoint.isPaused()) {
// 503 - Service unavailable
response.setStatus(503);
- adapter.log(request, response, 0);
+ getAdapter().log(request, response, 0);
error = true;
}
cping = false;
@@ -181,7 +181,7 @@ public class AjpNioProcessor extends Abs
if (!error) {
try {
rp.setStage(org.apache.coyote.Constants.STAGE_SERVICE);
- adapter.service(request, response);
+ getAdapter().service(request, response);
} catch (InterruptedIOException e) {
error = true;
} catch (Throwable t) {
@@ -189,7 +189,7 @@ public class AjpNioProcessor extends Abs
log.error(sm.getString("ajpprocessor.request.process"), t);
// 500 - Internal Server Error
response.setStatus(500);
- adapter.log(request, response, 0);
+ getAdapter().log(request, response, 0);
error = true;
}
}
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=1374037&r1=1374036&r2=1374037&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/ajp/AjpProcessor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/ajp/AjpProcessor.java Thu Aug 16 20:21:48 2012
@@ -166,7 +166,7 @@ public class AjpProcessor extends Abstra
log.debug(sm.getString("ajpprocessor.header.error"), t);
// 400 - Bad Request
response.setStatus(400);
- adapter.log(request, response, 0);
+ getAdapter().log(request, response, 0);
error = true;
}
@@ -180,7 +180,7 @@ public class AjpProcessor extends Abstra
log.debug(sm.getString("ajpprocessor.request.prepare"), t);
// 400 - Internal Server Error
response.setStatus(400);
- adapter.log(request, response, 0);
+ getAdapter().log(request, response, 0);
error = true;
}
}
@@ -188,7 +188,7 @@ public class AjpProcessor extends Abstra
if (!error && !cping && endpoint.isPaused()) {
// 503 - Service unavailable
response.setStatus(503);
- adapter.log(request, response, 0);
+ getAdapter().log(request, response, 0);
error = true;
}
cping = false;
@@ -197,7 +197,7 @@ public class AjpProcessor extends Abstra
if (!error) {
try {
rp.setStage(org.apache.coyote.Constants.STAGE_SERVICE);
- adapter.service(request, response);
+ getAdapter().service(request, response);
} catch (InterruptedIOException e) {
error = true;
} catch (Throwable t) {
@@ -205,7 +205,7 @@ public class AjpProcessor extends Abstra
log.error(sm.getString("ajpprocessor.request.process"), t);
// 500 - Internal Server Error
response.setStatus(500);
- adapter.log(request, response, 0);
+ getAdapter().log(request, response, 0);
error = true;
}
}
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=1374037&r1=1374036&r2=1374037&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java Thu Aug 16 20:21:48 2012
@@ -962,7 +962,7 @@ public abstract class AbstractHttp11Proc
}
// 400 - Bad Request
response.setStatus(400);
- adapter.log(request, response, 0);
+ getAdapter().log(request, response, 0);
error = true;
}
@@ -979,7 +979,7 @@ public abstract class AbstractHttp11Proc
}
// 400 - Internal Server Error
response.setStatus(400);
- adapter.log(request, response, 0);
+ getAdapter().log(request, response, 0);
error = true;
}
}
@@ -995,7 +995,7 @@ public abstract class AbstractHttp11Proc
if (!error) {
try {
rp.setStage(org.apache.coyote.Constants.STAGE_SERVICE);
- adapter.service(request, response);
+ getAdapter().service(request, response);
// Handle when the response was committed before a serious
// error occurred. Throwing a ServletException should both
// set the status to 500 and set the errorException.
@@ -1015,7 +1015,7 @@ public abstract class AbstractHttp11Proc
"http11processor.request.process"), t);
// 500 - Internal Server Error
response.setStatus(500);
- adapter.log(request, response, 0);
+ getAdapter().log(request, response, 0);
error = true;
}
}
@@ -1290,7 +1290,7 @@ public abstract class AbstractHttp11Proc
}
if (error) {
- adapter.log(request, response, 0);
+ getAdapter().log(request, response, 0);
}
}
@@ -1544,7 +1544,7 @@ public abstract class AbstractHttp11Proc
RequestInfo rp = request.getRequestProcessor();
try {
rp.setStage(org.apache.coyote.Constants.STAGE_SERVICE);
- error = !adapter.asyncDispatch(request, response, status);
+ error = !getAdapter().asyncDispatch(request, response, status);
resetTimeouts();
} catch (InterruptedIOException e) {
error = true;
@@ -1556,7 +1556,7 @@ public abstract class AbstractHttp11Proc
if (error) {
// 500 - Internal Server Error
response.setStatus(500);
- adapter.log(request, response, 0);
+ getAdapter().log(request, response, 0);
}
}
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=1374037&r1=1374036&r2=1374037&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java Thu Aug 16 20:21:48 2012
@@ -130,7 +130,7 @@ public class Http11AprProcessor extends
try {
rp.setStage(org.apache.coyote.Constants.STAGE_SERVICE);
- error = !adapter.event(request, response, status);
+ error = !getAdapter().event(request, response, status);
} catch (InterruptedIOException e) {
error = true;
} catch (Throwable t) {
@@ -138,7 +138,7 @@ public class Http11AprProcessor extends
log.error(sm.getString("http11processor.request.process"), t);
// 500 - Internal Server Error
response.setStatus(500);
- adapter.log(request, response, 0);
+ getAdapter().log(request, response, 0);
error = true;
}
@@ -194,7 +194,7 @@ public class Http11AprProcessor extends
if (endpoint.isPaused()) {
// 503 - Service unavailable
response.setStatus(503);
- adapter.log(request, response, 0);
+ getAdapter().log(request, response, 0);
error = true;
} else {
return true;
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=1374037&r1=1374036&r2=1374037&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java Thu Aug 16 20:21:48 2012
@@ -124,7 +124,7 @@ public class Http11NioProcessor extends
final NioEndpoint.KeyAttachment attach = (NioEndpoint.KeyAttachment)socket.getSocket().getAttachment(false);
try {
rp.setStage(org.apache.coyote.Constants.STAGE_SERVICE);
- error = !adapter.event(request, response, status);
+ error = !getAdapter().event(request, response, status);
if ( !error ) {
if (attach != null) {
attach.setComet(comet);
@@ -152,7 +152,7 @@ public class Http11NioProcessor extends
log.error(sm.getString("http11processor.request.process"), t);
// 500 - Internal Server Error
response.setStatus(500);
- adapter.log(request, response, 0);
+ getAdapter().log(request, response, 0);
error = true;
}
@@ -320,7 +320,7 @@ public class Http11NioProcessor extends
if (endpoint.isPaused()) {
// 503 - Service unavailable
response.setStatus(503);
- adapter.log(request, response, 0);
+ getAdapter().log(request, response, 0);
error = true;
} else {
return true;
Modified: tomcat/trunk/java/org/apache/coyote/spdy/SpdyProcessor.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/spdy/SpdyProcessor.java?rev=1374037&r1=1374036&r2=1374037&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/spdy/SpdyProcessor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/spdy/SpdyProcessor.java Thu Aug 16 20:21:48 2012
@@ -156,7 +156,7 @@ public class SpdyProcessor extends Abstr
RequestInfo rp = request.getRequestProcessor();
try {
rp.setStage(org.apache.coyote.Constants.STAGE_SERVICE);
- adapter.service(request, response);
+ getAdapter().service(request, response);
} catch (InterruptedIOException e) {
error = true;
} catch (Throwable t) {
@@ -165,7 +165,7 @@ public class SpdyProcessor extends Abstr
// 500 - Internal Server Error
t.printStackTrace();
response.setStatus(500);
- adapter.log(request, response, 0);
+ getAdapter().log(request, response, 0);
error = true;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org