Author: markt Date: Thu May 4 21:17:55 2017 New Revision: 1793910 URL: http://svn.apache.org/viewvc?rev=1793910&view=rev Log: Fix NPEs
Modified: tomcat/trunk/java/org/apache/catalina/connector/Request.java tomcat/trunk/java/org/apache/tomcat/util/http/Parameters.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=1793910&r1=1793909&r2=1793910&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:17:55 2017 @@ -2826,8 +2826,7 @@ public class Request implements HttpServ String name = part.getName(); String value = null; try { - Charset paramCharset = parameters.getCharset(); - value = part.getString(paramCharset.name()); + value = part.getString(charset.name()); } catch (UnsupportedEncodingException uee) { // Not possible } Modified: tomcat/trunk/java/org/apache/tomcat/util/http/Parameters.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/http/Parameters.java?rev=1793910&r1=1793909&r2=1793910&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/tomcat/util/http/Parameters.java (original) +++ tomcat/trunk/java/org/apache/tomcat/util/http/Parameters.java Thu May 4 21:17:55 2017 @@ -129,7 +129,7 @@ public final class Parameters { parameterCount = 0; paramHashValues.clear(); didQueryParameters = false; - charset = null; + charset = DEFAULT_BODY_CHARSET; decodedQuery.recycle(); parseFailedReason = null; } --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org