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/30 13:08:35 UTC
[tomcat] 04/07: Align with master. Spacing, Javadoc,
remove unnecessary (...)
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 6025ef74c90512ab242861cfdcd0ca5096417164
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Mon Jul 29 20:52:42 2019 +0100
Align with master. Spacing, Javadoc, remove unnecessary (...)
---
java/org/apache/catalina/connector/Request.java | 3 +--
java/org/apache/catalina/connector/Response.java | 24 +++++++++---------------
2 files changed, 10 insertions(+), 17 deletions(-)
diff --git a/java/org/apache/catalina/connector/Request.java b/java/org/apache/catalina/connector/Request.java
index 0fdfc63..1e95e74 100644
--- a/java/org/apache/catalina/connector/Request.java
+++ b/java/org/apache/catalina/connector/Request.java
@@ -129,7 +129,6 @@ public class Request implements org.apache.catalina.servlet4preview.http.HttpSer
// ----------------------------------------------------------- Constructors
-
public Request() {
formats = new SimpleDateFormat[formatsTemplate.length];
for(int i = 0; i < formats.length; i++) {
@@ -168,7 +167,6 @@ public class Request implements org.apache.catalina.servlet4preview.http.HttpSer
// ----------------------------------------------------- Variables
-
protected static final TimeZone GMT_ZONE = TimeZone.getTimeZone("GMT");
@@ -579,6 +577,7 @@ public class Request implements org.apache.catalina.servlet4preview.http.HttpSer
return mappingData.context;
}
+
/**
* @param context The newly associated Context
* @deprecated Use setters on {@link #getMappingData() MappingData} object.
diff --git a/java/org/apache/catalina/connector/Response.java b/java/org/apache/catalina/connector/Response.java
index 7b976e0..b3c4f13 100644
--- a/java/org/apache/catalina/connector/Response.java
+++ b/java/org/apache/catalina/connector/Response.java
@@ -33,7 +33,6 @@ import java.util.Enumeration;
import java.util.List;
import java.util.Locale;
import java.util.TimeZone;
-import java.util.Vector;
import javax.servlet.ServletOutputStream;
import javax.servlet.ServletResponse;
@@ -782,11 +781,10 @@ public class Response implements HttpServletResponse {
* of the request. This method must be called prior to reading
* request parameters or reading input using getReader().
*
- * @param characterEncoding String containing the name of the character
- * encoding.
+ * @param charset String containing the name of the character encoding.
*/
@Override
- public void setCharacterEncoding(String characterEncoding) {
+ public void setCharacterEncoding(String charset) {
if (isCommitted()) {
return;
@@ -804,9 +802,9 @@ public class Response implements HttpServletResponse {
}
try {
- getCoyoteResponse().setCharacterEncoding(characterEncoding);
+ getCoyoteResponse().setCharacterEncoding(charset);
} catch (IllegalArgumentException e) {
- log.warn(sm.getString("coyoteResponse.encoding.invalid", characterEncoding), e);
+ log.warn(sm.getString("coyoteResponse.encoding.invalid", charset), e);
return;
}
isCharacterEncodingSet = true;
@@ -870,7 +868,6 @@ public class Response implements HttpServletResponse {
@Override
public Collection<String> getHeaderNames() {
-
MimeHeaders headers = getCoyoteResponse().getMimeHeaders();
int n = headers.size();
List<String> result = new ArrayList<>(n);
@@ -884,12 +881,11 @@ public class Response implements HttpServletResponse {
@Override
public Collection<String> getHeaders(String name) {
-
Enumeration<String> enumeration =
getCoyoteResponse().getMimeHeaders().values(name);
- Vector<String> result = new Vector<>();
+ List<String> result = new ArrayList<>();
while (enumeration.hasMoreElements()) {
- result.addElement(enumeration.nextElement());
+ result.add(enumeration.nextElement());
}
return result;
}
@@ -1404,8 +1400,9 @@ public class Response implements HttpServletResponse {
char cc=name.charAt(0);
if (cc=='C' || cc=='c') {
- if (checkSpecialHeader(name, value))
+ if (checkSpecialHeader(name, value)) {
return;
+ }
}
getCoyoteResponse().setHeader(name, value);
@@ -1481,7 +1478,6 @@ public class Response implements HttpServletResponse {
// ------------------------------------------------------ Protected Methods
-
/**
* Return <code>true</code> if the specified URL should be encoded with
* a session identifier. This will be true if all of the following
@@ -1786,9 +1782,7 @@ public class Response implements HttpServletResponse {
}
private void copyChars(char[] c, int dest, int src, int len) {
- for (int pos = 0; pos < len; pos++) {
- c[pos + dest] = c[pos + src];
- }
+ System.arraycopy(c, src, c, dest, len);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org