Author: markt Date: Thu May 4 21:03:37 2017 New Revision: 1793907 URL: http://svn.apache.org/viewvc?rev=1793907&view=rev Log: Fix NPE
Modified: tomcat/trunk/java/org/apache/catalina/connector/Request.java Modified: tomcat/trunk/java/org/apache/catalina/connector/Request.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/Request.java?rev=1793907&r1=1793906&r2=1793907&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/connector/Request.java (original) +++ tomcat/trunk/java/org/apache/catalina/connector/Request.java Thu May 4 21:03:37 2017 @@ -994,10 +994,12 @@ public class Request implements HttpServ Context context = getContext(); if (context != null) { String encoding = context.getRequestCharacterEncoding(); - try { - return B2CConverter.getCharset(encoding); - } catch (UnsupportedEncodingException e) { - // Ignore + if (encoding != null) { + try { + return B2CConverter.getCharset(encoding); + } catch (UnsupportedEncodingException e) { + // Ignore + } } } --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org