Author: markt
Date: Tue May 2 09:13:40 2017
New Revision: 1793449
URL: http://svn.apache.org/viewvc?rev=1793449&view=rev
Log:
Fix possible NPE
Modified:
tomcat/trunk/java/org/apache/tomcat/util/digester/Digester.java
Modified: tomcat/trunk/java/org/apache/tomcat/util/digester/Digester.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/digester/Digester.java?rev=1793449&r1=1793448&r2=1793449&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/digester/Digester.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/digester/Digester.java Tue May 2
09:13:40 2017
@@ -1124,10 +1124,12 @@ public class Digester extends DefaultHan
if (locator instanceof Locator2) {
if (root instanceof DocumentProperties.Charset) {
String enc = ((Locator2) locator).getEncoding();
- try {
- ((DocumentProperties.Charset)
root).setCharset(B2CConverter.getCharset(enc));
- } catch (UnsupportedEncodingException e) {
- log.warn(sm.getString("disgester.encodingInvalid", enc),
e);
+ if (enc != null) {
+ try {
+ ((DocumentProperties.Charset)
root).setCharset(B2CConverter.getCharset(enc));
+ } catch (UnsupportedEncodingException e) {
+ log.warn(sm.getString("disgester.encodingInvalid",
enc), e);
+ }
}
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
