Author: markt
Date: Mon Jun 19 19:56:23 2017
New Revision: 1799272
URL: http://svn.apache.org/viewvc?rev=1799272&view=rev
Log:
Refactor to reduce the need to deprecate code in 8.5.x
Modified:
tomcat/trunk/java/org/apache/catalina/connector/Response.java
tomcat/trunk/java/org/apache/coyote/Response.java
Modified: tomcat/trunk/java/org/apache/catalina/connector/Response.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/Response.java?rev=1799272&r1=1799271&r2=1799272&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/connector/Response.java (original)
+++ tomcat/trunk/java/org/apache/catalina/connector/Response.java Mon Jun 19
19:56:23 2017
@@ -803,7 +803,7 @@ public class Response implements HttpSer
// Ignore charset if getWriter() has already been called
if (!usingWriter) {
try {
- getCoyoteResponse().setCharset(m[1]);
+ getCoyoteResponse().setCharacterEncoding(m[1]);
} catch (UnsupportedEncodingException e) {
log.warn(sm.getString("coyoteResponse.encoding.invalid",
m[1]), e);
}
@@ -840,7 +840,7 @@ public class Response implements HttpSer
}
try {
- getCoyoteResponse().setCharset(charset);
+ getCoyoteResponse().setCharacterEncoding(charset);
} catch (UnsupportedEncodingException e) {
log.warn(sm.getString("coyoteResponse.encoding.invalid", charset),
e);
return;
@@ -882,7 +882,7 @@ public class Response implements HttpSer
String charset = getContext().getCharset(locale);
if (charset != null) {
try {
- getCoyoteResponse().setCharset(charset);
+ getCoyoteResponse().setCharacterEncoding(charset);
} catch (UnsupportedEncodingException e) {
log.warn(sm.getString("coyoteResponse.encoding.invalid",
charset), e);
}
Modified: tomcat/trunk/java/org/apache/coyote/Response.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/Response.java?rev=1799272&r1=1799271&r2=1799272&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/Response.java (original)
+++ tomcat/trunk/java/org/apache/coyote/Response.java Mon Jun 19 19:56:23 2017
@@ -424,7 +424,7 @@ public final class Response {
* @throws UnsupportedEncodingException If the specified name is not
* recognised
*/
- public void setCharset(String characterEncoding) throws
UnsupportedEncodingException {
+ public void setCharacterEncoding(String characterEncoding) throws
UnsupportedEncodingException {
if (isCommitted()) {
return;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
