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 2019/07/11 13:36:55 UTC
[tomcat] 01/03: Align more closely with 8.5.x to ease back-ports
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 7.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 9bd2ec0967840f4a15004ba5a3fa7c43b487c5fe
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Thu Jul 11 14:31:56 2019 +0100
Align more closely with 8.5.x to ease back-ports
---
test/org/apache/catalina/startup/TomcatBaseTest.java | 16 ++++++++++------
1 file changed, 10 insertions(+), 6 deletions(-)
diff --git a/test/org/apache/catalina/startup/TomcatBaseTest.java b/test/org/apache/catalina/startup/TomcatBaseTest.java
index a4fc307..0b77e9f 100644
--- a/test/org/apache/catalina/startup/TomcatBaseTest.java
+++ b/test/org/apache/catalina/startup/TomcatBaseTest.java
@@ -60,14 +60,18 @@ import org.apache.tomcat.util.buf.ByteChunk;
* don't have to keep writing the cleanup code.
*/
public abstract class TomcatBaseTest extends LoggingBaseTest {
- private Tomcat tomcat;
- private boolean accessLogEnabled = false;
+
protected static final int DEFAULT_CLIENT_TIMEOUT_MS = 300000;
public static final String TEMP_DIR = System.getProperty("java.io.tmpdir");
+ private Tomcat tomcat;
+ private boolean accessLogEnabled = false;
+
/**
- * Make Tomcat instance accessible to sub-classes.
+ * Make the Tomcat instance available to sub-classes.
+ *
+ * @return A Tomcat instance without any pre-configured web applications
*/
public Tomcat getTomcatInstance() {
return tomcat;
@@ -80,7 +84,7 @@ public abstract class TomcatBaseTest extends LoggingBaseTest {
return tomcat.getConnector().getLocalPort();
}
- /**
+ /*
* Sub-classes may want to check, whether an AccessLogValve is active
*/
public boolean isAccessLogEnabled() {
@@ -407,12 +411,12 @@ public abstract class TomcatBaseTest extends LoggingBaseTest {
StringBuilder value;
Object attribute;
+ response.setContentType("text/plain");
+
ServletContext ctx = this.getServletContext();
HttpSession session = request.getSession(false);
PrintWriter out = response.getWriter();
- response.setContentType("text/plain");
-
out.println("CONTEXT-NAME: " + ctx.getServletContextName());
out.println("CONTEXT-PATH: " + ctx.getContextPath());
out.println("CONTEXT-MAJOR-VERSION: " + ctx.getMajorVersion());
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org