This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 89864d971fdcf4fcbd40b692c216f57ae3e7f437
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Wed Aug 9 19:58:25 2023 +0100
Refactor to enforce 1-2-1 mapping for request and Coyote request
---
java/org/apache/catalina/connector/Connector.java | 12 +++-
.../apache/catalina/connector/CoyoteAdapter.java | 6 +-
java/org/apache/catalina/connector/Request.java | 27 ++++-----
.../TesterDigestAuthenticatorPerformance.java | 2 +-
.../apache/catalina/connector/TestResponse.java | 6 +-
.../apache/catalina/core/TestAsyncContextImpl.java | 3 +-
.../catalina/filters/TestRemoteIpFilter.java | 3 +-
test/org/apache/catalina/realm/TestRealmBase.java | 2 +-
.../catalina/session/TestPersistentManager.java | 2 +-
.../apache/catalina/valves/TestRemoteIpValve.java | 70 ++++++++--------------
.../catalina/valves/TestRequestFilterValve.java | 5 +-
test/org/apache/catalina/valves/TestSSLValve.java | 3 +-
test/org/apache/tomcat/unittest/TesterRequest.java | 2 +-
.../util/http/TestRequestUtilSameOrigin.java | 2 +-
14 files changed, 57 insertions(+), 88 deletions(-)
diff --git a/java/org/apache/catalina/connector/Connector.java
b/java/org/apache/catalina/connector/Connector.java
index 25b3df6874..b860ebd68a 100644
--- a/java/org/apache/catalina/connector/Connector.java
+++ b/java/org/apache/catalina/connector/Connector.java
@@ -894,10 +894,14 @@ public class Connector extends LifecycleMBeanBase {
* Create (or allocate) and return a Request object suitable for
specifying the contents of a Request to the
* responsible Container.
*
+ * @param coyoteRequest The Coyote request with which the Request object
will always be associated. In normal usage
+ * this must be non-null. In some test scenarios,
it may be possible to use a null request
+ * without triggering an NPE.
+ *
* @return a new Servlet request object
*/
- public Request createRequest() {
- return new Request(this);
+ public Request createRequest(org.apache.coyote.Request coyoteRequest) {
+ return new Request(this, coyoteRequest);
}
@@ -905,7 +909,9 @@ public class Connector extends LifecycleMBeanBase {
* Create and return a Response object suitable for receiving the contents
of a Response from the responsible
* Container.
*
- * @param coyoteResponse The associated Coyote response.
+ * @param coyoteResponse The Coyote request with which the Response object
will always be associated. In normal
+ * usage this must be non-null. In some test
scenarios, it may be possible to use a null
+ * response without triggering an NPE.
*
* @return a new Servlet response object
*/
diff --git a/java/org/apache/catalina/connector/CoyoteAdapter.java
b/java/org/apache/catalina/connector/CoyoteAdapter.java
index da8d63a66c..a6dc0cb3a3 100644
--- a/java/org/apache/catalina/connector/CoyoteAdapter.java
+++ b/java/org/apache/catalina/connector/CoyoteAdapter.java
@@ -304,8 +304,7 @@ public class CoyoteAdapter implements Adapter {
if (request == null) {
// Create objects
- request = connector.createRequest();
- request.setCoyoteRequest(req);
+ request = connector.createRequest(req);
response = connector.createResponse(res);
// Link objects
@@ -450,8 +449,7 @@ public class CoyoteAdapter implements Adapter {
if (request == null) {
// Create objects
- request = connector.createRequest();
- request.setCoyoteRequest(req);
+ request = connector.createRequest(req);
response = connector.createResponse(res);
// Link objects
diff --git a/java/org/apache/catalina/connector/Request.java
b/java/org/apache/catalina/connector/Request.java
index 4cea6996f1..a13eee3bb6 100644
--- a/java/org/apache/catalina/connector/Request.java
+++ b/java/org/apache/catalina/connector/Request.java
@@ -136,12 +136,17 @@ public class Request implements HttpServletRequest {
/**
* Create a new Request object associated with the given Connector.
*
- * @param connector The Connector with which this Request object will
always be associated. In normal usage this
- * must be non-null. In some test scenarios, it may
be possible to use a null Connector without
- * triggering an NPE.
- */
- public Request(Connector connector) {
+ * @param connector The Connector with which this Request object will
always be associated. In normal usage this
+ * must be non-null. In some test scenarios, it
may be possible to use a null Connector
+ * without triggering an NPE.
+ * @param coyoteRequest The Coyote request with which this Request object
will always be associated. In normal usage
+ * this must be non-null. In some test scenarios,
it may be possible to use a null request
+ * without triggering an NPE.
+ */
+ public Request(Connector connector, org.apache.coyote.Request
coyoteRequest) {
this.connector = connector;
+ this.coyoteRequest = coyoteRequest;
+ inputBuffer.setRequest(coyoteRequest);
}
@@ -151,17 +156,7 @@ public class Request implements HttpServletRequest {
/**
* Coyote request.
*/
- protected org.apache.coyote.Request coyoteRequest;
-
- /**
- * Set the Coyote request.
- *
- * @param coyoteRequest The Coyote request
- */
- public void setCoyoteRequest(org.apache.coyote.Request coyoteRequest) {
- this.coyoteRequest = coyoteRequest;
- inputBuffer.setRequest(coyoteRequest);
- }
+ protected final org.apache.coyote.Request coyoteRequest;
/**
* Get the Coyote request.
diff --git
a/test/org/apache/catalina/authenticator/TesterDigestAuthenticatorPerformance.java
b/test/org/apache/catalina/authenticator/TesterDigestAuthenticatorPerformance.java
index ae66487ec0..ad417f2e5c 100644
---
a/test/org/apache/catalina/authenticator/TesterDigestAuthenticatorPerformance.java
+++
b/test/org/apache/catalina/authenticator/TesterDigestAuthenticatorPerformance.java
@@ -250,7 +250,7 @@ public class TesterDigestAuthenticatorPerformance {
private String authHeader = null;
TesterDigestRequest() {
- super(null);
+ super(null, null);
}
@Override
diff --git a/test/org/apache/catalina/connector/TestResponse.java
b/test/org/apache/catalina/connector/TestResponse.java
index 13f56b6a32..574a3b8582 100644
--- a/test/org/apache/catalina/connector/TestResponse.java
+++ b/test/org/apache/catalina/connector/TestResponse.java
@@ -600,9 +600,8 @@ public class TestResponse extends TomcatBaseTest {
Connector connector = new Connector();
org.apache.coyote.Response cResponse = new
org.apache.coyote.Response();
Response response = new Response(cResponse);
- Request request = new Request(connector);
org.apache.coyote.Request cRequest = new org.apache.coyote.Request();
- request.setCoyoteRequest(cRequest);
+ Request request = new Request(connector, cRequest);
Context context = new TesterContext();
request.getMappingData().context = context;
response.setRequest(request);
@@ -963,9 +962,8 @@ public class TestResponse extends TomcatBaseTest {
Connector connector = new Connector();
org.apache.coyote.Response cResponse = new
org.apache.coyote.Response();
Response response = new Response(cResponse);
- Request request = new Request(connector);
org.apache.coyote.Request cRequest = new org.apache.coyote.Request();
- request.setCoyoteRequest(cRequest);
+ Request request = new Request(connector, cRequest);
Context context = new TesterContext();
request.getMappingData().context = context;
response.setRequest(request);
diff --git a/test/org/apache/catalina/core/TestAsyncContextImpl.java
b/test/org/apache/catalina/core/TestAsyncContextImpl.java
index ae24190742..0d1f7febca 100644
--- a/test/org/apache/catalina/core/TestAsyncContextImpl.java
+++ b/test/org/apache/catalina/core/TestAsyncContextImpl.java
@@ -2552,8 +2552,7 @@ public class TestAsyncContextImpl extends TomcatBaseTest {
};
final Context context = new TesterContext();
final Response response = new Response(null);
- final Request request = new Request(null);
- request.setCoyoteRequest(new org.apache.coyote.Request());
+ final Request request = new Request(null, new
org.apache.coyote.Request());
request.getMappingData().context = context;
final AsyncContextImpl ac = new AsyncContextImpl(request);
ac.addListener(listener, servletRequest, servletResponse);
diff --git a/test/org/apache/catalina/filters/TestRemoteIpFilter.java
b/test/org/apache/catalina/filters/TestRemoteIpFilter.java
index 82c8bb8f79..c15023a62a 100644
--- a/test/org/apache/catalina/filters/TestRemoteIpFilter.java
+++ b/test/org/apache/catalina/filters/TestRemoteIpFilter.java
@@ -120,8 +120,7 @@ public class TestRemoteIpFilter extends TomcatBaseTest {
*/
public static class MockHttpServletRequest extends Request {
public MockHttpServletRequest() {
- super(new Connector());
- setCoyoteRequest(new org.apache.coyote.Request());
+ super(new Connector(), new org.apache.coyote.Request());
}
public MockHttpServletRequest(String ipAddress) {
diff --git a/test/org/apache/catalina/realm/TestRealmBase.java
b/test/org/apache/catalina/realm/TestRealmBase.java
index 3d1fde0d84..ec2df090ad 100644
--- a/test/org/apache/catalina/realm/TestRealmBase.java
+++ b/test/org/apache/catalina/realm/TestRealmBase.java
@@ -614,7 +614,7 @@ public class TestRealmBase {
new SecurityConstraint[] { constraintOne, constraintTwo };
// Set up the mock request and response
- Request request = new Request(null);
+ Request request = new Request(null, null);
Response response = new TesterResponse();
Context context = new TesterContext();
for (String applicationRole : applicationRoles) {
diff --git a/test/org/apache/catalina/session/TestPersistentManager.java
b/test/org/apache/catalina/session/TestPersistentManager.java
index b7ef69d668..d1a1dbf2ed 100644
--- a/test/org/apache/catalina/session/TestPersistentManager.java
+++ b/test/org/apache/catalina/session/TestPersistentManager.java
@@ -108,7 +108,7 @@ public class TestPersistentManager {
context.setParent(host);
Connector connector = EasyMock.createNiceMock(Connector.class);
- Request req = new Request(connector) {
+ Request req = new Request(connector, null) {
@Override
public Context getContext() {
return context;
diff --git a/test/org/apache/catalina/valves/TestRemoteIpValve.java
b/test/org/apache/catalina/valves/TestRemoteIpValve.java
index 054dfe6fa8..f8c0b72a1b 100644
--- a/test/org/apache/catalina/valves/TestRemoteIpValve.java
+++ b/test/org/apache/catalina/valves/TestRemoteIpValve.java
@@ -95,8 +95,8 @@ public class TestRemoteIpValve {
public static class MockRequest extends Request {
- public MockRequest() {
- super(new Connector());
+ public MockRequest(org.apache.coyote.Request coyoteRequest) {
+ super(new Connector(), coyoteRequest);
}
@Override
@@ -121,8 +121,7 @@ public class TestRemoteIpValve {
RemoteAddrAndHostTrackerValve remoteAddrAndHostTrackerValve = new
RemoteAddrAndHostTrackerValve();
remoteIpValve.setNext(remoteAddrAndHostTrackerValve);
- Request request = new MockRequest();
- request.setCoyoteRequest(new org.apache.coyote.Request());
+ Request request = new MockRequest(new org.apache.coyote.Request());
request.setRemoteAddr("192.168.0.10");
request.setRemoteHost("remote-host-original-value");
@@ -162,8 +161,7 @@ public class TestRemoteIpValve {
RemoteAddrAndHostTrackerValve remoteAddrAndHostTrackerValve = new
RemoteAddrAndHostTrackerValve();
remoteIpValve.setNext(remoteAddrAndHostTrackerValve);
- Request request = new MockRequest();
- request.setCoyoteRequest(new org.apache.coyote.Request());
+ Request request = new MockRequest(new org.apache.coyote.Request());
request.setRemoteAddr("192.168.0.10");
request.setRemoteHost("remote-host-original-value");
request.getCoyoteRequest().getMimeHeaders().addValue("x-forwarded-for")
@@ -205,8 +203,7 @@ public class TestRemoteIpValve {
RemoteAddrAndHostTrackerValve remoteAddrAndHostTrackerValve = new
RemoteAddrAndHostTrackerValve();
remoteIpValve.setNext(remoteAddrAndHostTrackerValve);
- Request request = new MockRequest();
- request.setCoyoteRequest(new org.apache.coyote.Request());
+ Request request = new MockRequest(new org.apache.coyote.Request());
request.setRemoteAddr("proxy3");
request.setRemoteHost("remote-host-original-value");
request.getCoyoteRequest().getMimeHeaders().addValue("x-forwarded-for")
@@ -247,8 +244,7 @@ public class TestRemoteIpValve {
RemoteAddrAndHostTrackerValve remoteAddrAndHostTrackerValve = new
RemoteAddrAndHostTrackerValve();
remoteIpValve.setNext(remoteAddrAndHostTrackerValve);
- Request request = new MockRequest();
- request.setCoyoteRequest(new org.apache.coyote.Request());
+ Request request = new MockRequest(new org.apache.coyote.Request());
request.setRemoteAddr("proxy3");
request.setRemoteHost("remote-host-original-value");
request.getCoyoteRequest().getMimeHeaders().addValue("x-forwarded-for")
@@ -290,8 +286,7 @@ public class TestRemoteIpValve {
RemoteAddrAndHostTrackerValve remoteAddrAndHostTrackerValve = new
RemoteAddrAndHostTrackerValve();
remoteIpValve.setNext(remoteAddrAndHostTrackerValve);
- Request request = new MockRequest();
- request.setCoyoteRequest(new org.apache.coyote.Request());
+ Request request = new MockRequest(new org.apache.coyote.Request());
request.setRemoteAddr("192.168.0.10");
request.setRemoteHost("remote-host-original-value");
request.getCoyoteRequest().getMimeHeaders().addValue("x-forwarded-for")
@@ -333,8 +328,7 @@ public class TestRemoteIpValve {
RemoteAddrAndHostTrackerValve remoteAddrAndHostTrackerValve = new
RemoteAddrAndHostTrackerValve();
remoteIpValve.setNext(remoteAddrAndHostTrackerValve);
- Request request = new MockRequest();
- request.setCoyoteRequest(new org.apache.coyote.Request());
+ Request request = new MockRequest(new org.apache.coyote.Request());
request.setRemoteAddr("192.168.0.10");
request.setRemoteHost("remote-host-original-value");
request.getCoyoteRequest().getMimeHeaders().addValue("x-forwarded-for")
@@ -375,8 +369,7 @@ public class TestRemoteIpValve {
RemoteAddrAndHostTrackerValve remoteAddrAndHostTrackerValve = new
RemoteAddrAndHostTrackerValve();
remoteIpValve.setNext(remoteAddrAndHostTrackerValve);
- Request request = new MockRequest();
- request.setCoyoteRequest(new org.apache.coyote.Request());
+ Request request = new MockRequest(new org.apache.coyote.Request());
request.setRemoteAddr("192.168.0.10");
request.setRemoteHost("remote-host-original-value");
request.getCoyoteRequest().getMimeHeaders().addValue("x-forwarded-for").setString("140.211.11.130");
@@ -419,8 +412,7 @@ public class TestRemoteIpValve {
RemoteAddrAndHostTrackerValve remoteAddrAndHostTrackerValve = new
RemoteAddrAndHostTrackerValve();
remoteIpValve.setNext(remoteAddrAndHostTrackerValve);
- Request request = new MockRequest();
- request.setCoyoteRequest(new org.apache.coyote.Request());
+ Request request = new MockRequest(new org.apache.coyote.Request());
request.setRemoteAddr("172.16.0.5");
request.setRemoteHost("remote-host-original-value");
request.getCoyoteRequest().getMimeHeaders().addValue("x-forwarded-for").setString("209.244.0.3");
@@ -451,8 +443,7 @@ public class TestRemoteIpValve {
String scheme = remoteAddrAndHostTrackerValve.getScheme();
Assert.assertEquals("Scheme should be marked to https.", "https",
scheme);
- request = new MockRequest();
- request.setCoyoteRequest(new org.apache.coyote.Request());
+ request = new MockRequest(new org.apache.coyote.Request());
request.setRemoteAddr("172.25.250.250");
request.setRemoteHost("remote-host-original-value");
request.getCoyoteRequest().getMimeHeaders().addValue("x-forwarded-for").setString("209.244.0.3");
@@ -497,8 +488,7 @@ public class TestRemoteIpValve {
RemoteAddrAndHostTrackerValve remoteAddrAndHostTrackerValve = new
RemoteAddrAndHostTrackerValve();
remoteIpValve.setNext(remoteAddrAndHostTrackerValve);
- Request request = new MockRequest();
- request.setCoyoteRequest(new org.apache.coyote.Request());
+ Request request = new MockRequest(new org.apache.coyote.Request());
// client ip
request.setRemoteAddr("192.168.0.10");
request.setRemoteHost("192.168.0.10");
@@ -562,8 +552,7 @@ public class TestRemoteIpValve {
RemoteAddrAndHostTrackerValve remoteAddrAndHostTrackerValve = new
RemoteAddrAndHostTrackerValve();
remoteIpValve.setNext(remoteAddrAndHostTrackerValve);
- Request request = new MockRequest();
- request.setCoyoteRequest(new org.apache.coyote.Request());
+ Request request = new MockRequest(new org.apache.coyote.Request());
// client ip
request.setRemoteAddr("192.168.0.10");
request.setRemoteHost("192.168.0.10");
@@ -627,8 +616,7 @@ public class TestRemoteIpValve {
RemoteAddrAndHostTrackerValve remoteAddrAndHostTrackerValve = new
RemoteAddrAndHostTrackerValve();
remoteIpValve.setNext(remoteAddrAndHostTrackerValve);
- Request request = new MockRequest();
- request.setCoyoteRequest(new org.apache.coyote.Request());
+ Request request = new MockRequest(new org.apache.coyote.Request());
// client ip
request.setRemoteAddr("192.168.0.10");
request.setRemoteHost("192.168.0.10");
@@ -729,8 +717,7 @@ public class TestRemoteIpValve {
RemoteAddrAndHostTrackerValve remoteAddrAndHostTrackerValve = new
RemoteAddrAndHostTrackerValve();
remoteIpValve.setNext(remoteAddrAndHostTrackerValve);
- Request request = new MockRequest();
- request.setCoyoteRequest(new org.apache.coyote.Request());
+ Request request = new MockRequest(new org.apache.coyote.Request());
// client ip
request.setRemoteAddr("192.168.0.10");
request.setRemoteHost("192.168.0.10");
@@ -796,8 +783,7 @@ public class TestRemoteIpValve {
RemoteAddrAndHostTrackerValve remoteAddrAndHostTrackerValve = new
RemoteAddrAndHostTrackerValve();
remoteIpValve.setNext(remoteAddrAndHostTrackerValve);
- Request request = new MockRequest();
- request.setCoyoteRequest(new org.apache.coyote.Request());
+ Request request = new MockRequest(new org.apache.coyote.Request());
// client ip
request.setRemoteAddr("192.168.0.10");
request.setRemoteHost("192.168.0.10");
@@ -862,8 +848,7 @@ public class TestRemoteIpValve {
RemoteAddrAndHostTrackerValve remoteAddrAndHostTrackerValve = new
RemoteAddrAndHostTrackerValve();
remoteIpValve.setNext(remoteAddrAndHostTrackerValve);
- Request request = new MockRequest();
- request.setCoyoteRequest(new org.apache.coyote.Request());
+ Request request = new MockRequest(new org.apache.coyote.Request());
// client ip
request.setRemoteAddr("192.168.0.10");
request.setRemoteHost("192.168.0.10");
@@ -918,8 +903,7 @@ public class TestRemoteIpValve {
RemoteAddrAndHostTrackerValve remoteAddrAndHostTrackerValve = new
RemoteAddrAndHostTrackerValve();
remoteIpValve.setNext(remoteAddrAndHostTrackerValve);
- Request request = new MockRequest();
- request.setCoyoteRequest(new org.apache.coyote.Request());
+ Request request = new MockRequest(new org.apache.coyote.Request());
// client ip
request.setRemoteAddr("192.168.0.10");
request.setRemoteHost("192.168.0.10");
@@ -974,8 +958,7 @@ public class TestRemoteIpValve {
RemoteAddrAndHostTrackerValve remoteAddrAndHostTrackerValve = new
RemoteAddrAndHostTrackerValve();
remoteIpValve.setNext(remoteAddrAndHostTrackerValve);
- Request request = new MockRequest();
- request.setCoyoteRequest(new org.apache.coyote.Request());
+ Request request = new MockRequest(new org.apache.coyote.Request());
request.setRemoteAddr("not-allowed-internal-proxy");
request.setRemoteHost("not-allowed-internal-proxy-host");
request.getCoyoteRequest().getMimeHeaders().addValue("x-forwarded-for")
@@ -1015,8 +998,7 @@ public class TestRemoteIpValve {
RemoteAddrAndHostTrackerValve remoteAddrAndHostTrackerValve = new
RemoteAddrAndHostTrackerValve();
remoteIpValve.setNext(remoteAddrAndHostTrackerValve);
- Request request = new MockRequest();
- request.setCoyoteRequest(new org.apache.coyote.Request());
+ Request request = new MockRequest(new org.apache.coyote.Request());
request.setRemoteAddr("192.168.0.10");
request.setRemoteHost("remote-host-original-value");
request.getCoyoteRequest().getMimeHeaders().addValue("x-forwarded-for")
@@ -1071,8 +1053,7 @@ public class TestRemoteIpValve {
RemoteAddrAndHostTrackerValve remoteAddrAndHostTrackerValve = new
RemoteAddrAndHostTrackerValve();
remoteIpValve.setNext(remoteAddrAndHostTrackerValve);
- Request request = new MockRequest();
- request.setCoyoteRequest(new org.apache.coyote.Request());
+ Request request = new MockRequest(new org.apache.coyote.Request());
// client ip
request.setRemoteAddr("192.168.0.10");
request.setRemoteHost("192.168.0.10");
@@ -1105,8 +1086,7 @@ public class TestRemoteIpValve {
RemoteAddrAndHostTrackerValve remoteAddrAndHostTrackerValve = new
RemoteAddrAndHostTrackerValve();
remoteIpValve.setNext(remoteAddrAndHostTrackerValve);
- Request request = new MockRequest();
- request.setCoyoteRequest(new org.apache.coyote.Request());
+ Request request = new MockRequest(new org.apache.coyote.Request());
// client ip
request.setRemoteAddr("192.168.0.10");
request.setRemoteHost("192.168.0.10");
@@ -1131,8 +1111,7 @@ public class TestRemoteIpValve {
RemoteAddrAndHostTrackerValve remoteAddrAndHostTrackerValve = new
RemoteAddrAndHostTrackerValve();
remoteIpValve.setNext(remoteAddrAndHostTrackerValve);
- Request request = new MockRequest();
- request.setCoyoteRequest(new org.apache.coyote.Request());
+ Request request = new MockRequest(new org.apache.coyote.Request());
// client ip
request.setRemoteAddr("192.168.0.10");
request.setRemoteHost("192.168.0.10");
@@ -1159,8 +1138,7 @@ public class TestRemoteIpValve {
RemoteAddrAndHostTrackerValve remoteAddrAndHostTrackerValve = new
RemoteAddrAndHostTrackerValve();
remoteIpValve.setNext(remoteAddrAndHostTrackerValve);
- Request request = new MockRequest();
- request.setCoyoteRequest(new org.apache.coyote.Request());
+ Request request = new MockRequest(new org.apache.coyote.Request());
// client ip
request.setRemoteAddr("192.168.0.10");
request.setRemoteHost("192.168.0.10");
diff --git a/test/org/apache/catalina/valves/TestRequestFilterValve.java
b/test/org/apache/catalina/valves/TestRequestFilterValve.java
index eb83ed1d9c..2fad52de12 100644
--- a/test/org/apache/catalina/valves/TestRequestFilterValve.java
+++ b/test/org/apache/catalina/valves/TestRequestFilterValve.java
@@ -111,19 +111,16 @@ public class TestRequestFilterValve {
RequestFilterValve valve = null;
Connector connector = new Connector();
Context context = new StandardContext();
- Request request = new Request(connector);
+ Request request = new Request(connector, new
org.apache.coyote.Request());
Response response = new MockResponse();
StringBuilder msg = new StringBuilder();
int expected = allowed ? OK : FORBIDDEN;
connector.setPort(PORT);
request.getMappingData().context = context;
- request.setCoyoteRequest(new org.apache.coyote.Request());
Assert.assertNotNull("Invalid test with null type", type);
- request.setCoyoteRequest(new org.apache.coyote.Request());
-
if (property != null) {
if (type.equals("Addr")) {
valve = new RemoteAddrValve();
diff --git a/test/org/apache/catalina/valves/TestSSLValve.java
b/test/org/apache/catalina/valves/TestSSLValve.java
index 3d8df7bd01..5c7753e1dc 100644
--- a/test/org/apache/catalina/valves/TestSSLValve.java
+++ b/test/org/apache/catalina/valves/TestSSLValve.java
@@ -37,8 +37,7 @@ public class TestSSLValve {
public static class MockRequest extends Request {
public MockRequest() {
- super(EasyMock.createMock(Connector.class));
- setCoyoteRequest(new org.apache.coyote.Request());
+ super(EasyMock.createMock(Connector.class), new
org.apache.coyote.Request());
}
@Override
diff --git a/test/org/apache/tomcat/unittest/TesterRequest.java
b/test/org/apache/tomcat/unittest/TesterRequest.java
index cdecdffe20..7bf76321b1 100644
--- a/test/org/apache/tomcat/unittest/TesterRequest.java
+++ b/test/org/apache/tomcat/unittest/TesterRequest.java
@@ -44,7 +44,7 @@ public class TesterRequest extends Request {
public TesterRequest(boolean withSession) {
- super(null);
+ super(null, null);
context = new TesterContext();
servletContext = new TesterServletContext();
context.setServletContext(servletContext);
diff --git a/test/org/apache/tomcat/util/http/TestRequestUtilSameOrigin.java
b/test/org/apache/tomcat/util/http/TestRequestUtilSameOrigin.java
index 49882c3204..e47e7d80d3 100644
--- a/test/org/apache/tomcat/util/http/TestRequestUtilSameOrigin.java
+++ b/test/org/apache/tomcat/util/http/TestRequestUtilSameOrigin.java
@@ -84,7 +84,7 @@ public class TestRequestUtilSameOrigin {
private final int port;
TesterRequest(String scheme, String host, int port) {
- super(new Request(null));
+ super(new Request(null, null));
this.scheme = scheme;
this.host = host;
this.port = port;
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
