Author: markt
Date: Fri Mar 10 16:13:55 2017
New Revision: 1786375
URL: http://svn.apache.org/viewvc?rev=1786375&view=rev
Log:
Correct a bug in the implementation of the new Servlet 4.0 feature that allows
specifying a default request and/or response character encoding per web
application. null values passed via the programmatic interface no longer
trigger a NullPointerException.
Modified:
tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/WebXml.java
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/WebXml.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/WebXml.java?rev=1786375&r1=1786374&r2=1786375&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/WebXml.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/WebXml.java Fri Mar
10 16:13:55 2017
@@ -615,7 +615,7 @@ public class WebXml extends XmlEncodingB
return requestEncoding;
}
public void setRequestEncoding(String requestEncoding) {
- if (requestEncoding == null) {
+ if (requestEncoding != null) {
try {
B2CConverter.getCharset(requestEncoding);
} catch (UnsupportedEncodingException e) {
@@ -630,7 +630,7 @@ public class WebXml extends XmlEncodingB
return responseEncoding;
}
public void setResponseEncoding(String responseEncoding) {
- if (responseEncoding == null) {
+ if (responseEncoding != null) {
try {
B2CConverter.getCharset(responseEncoding);
} catch (UnsupportedEncodingException e) {
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1786375&r1=1786374&r2=1786375&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Fri Mar 10 16:13:55 2017
@@ -52,6 +52,13 @@
<code>HttpHeaderSecurityFilter</code> for the HSTS preload parameter.
(markt)
</add>
+ <fix>
+ Correct a bug in the implementation of the Servlet 4.0 feature that
+ allows specifying a default request and/or response character encoding
+ per web application. <code>null</code> values passed via the
+ programmatic interface no longer trigger a
+ <code>NullPointerException</code>. (markt)
+ </fix>
</changelog>
</subsection>
<subsection name="Coyote">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
