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
The following commit(s) were added to refs/heads/8.5.x by this push:
new 916c128 Polish. Align with master.
916c128 is described below
commit 916c128fe82a5b10456bf3d7bff8d282266c1e51
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Wed Jul 10 16:10:23 2019 +0100
Polish. Align with master.
---
java/org/apache/coyote/Response.java | 12 +++++-------
1 file changed, 5 insertions(+), 7 deletions(-)
diff --git a/java/org/apache/coyote/Response.java
b/java/org/apache/coyote/Response.java
index c3ee057..536f50f 100644
--- a/java/org/apache/coyote/Response.java
+++ b/java/org/apache/coyote/Response.java
@@ -456,13 +456,12 @@ public final class Response {
return contentLanguage;
}
+
/**
- * Overrides the name of the character encoding used in the body
- * of the response. This method must be called prior to writing output
- * using getWriter().
+ * Overrides the character encoding used in the body of the response. This
+ * method must be called prior to writing output using getWriter().
*
- * @param characterEncoding String containing the name of the character
- * encoding.
+ * @param characterEncoding The name of character encoding.
*/
public void setCharacterEncoding(String characterEncoding) {
if (isCommitted()) {
@@ -547,8 +546,7 @@ public final class Response {
String ret = contentType;
- if (ret != null
- && charset != null) {
+ if (ret != null && charset != null) {
ret = ret + ";charset=" + characterEncoding;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
