This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/master by this push:
new f3517e7 Polish. Align with 8.5.x.
f3517e7 is described below
commit f3517e7acfac217ae1659f0732000f598c2317f9
Author: Mark Thomas <[email protected]>
AuthorDate: Wed Jul 10 16:08:47 2019 +0100
Polish. Align with 8.5.x.
---
java/org/apache/coyote/Response.java | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/java/org/apache/coyote/Response.java
b/java/org/apache/coyote/Response.java
index 1aa1937..b9f22b7 100644
--- a/java/org/apache/coyote/Response.java
+++ b/java/org/apache/coyote/Response.java
@@ -503,6 +503,9 @@ public final class Response {
}
+ /**
+ * @return The name of the current encoding
+ */
public String getCharacterEncoding() {
return characterEncoding;
}
@@ -561,8 +564,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: [email protected]
For additional commands, e-mail: [email protected]
