Author: markt Date: Thu Aug 9 14:40:29 2018 New Revision: 1837736 URL: http://svn.apache.org/viewvc?rev=1837736&view=rev Log: Update FileUpload Most changes had already been applied (because we back-ported them to Commons after some local clean-up)
Modified: tomcat/trunk/MERGE.txt tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/MultipartStream.java Modified: tomcat/trunk/MERGE.txt URL: http://svn.apache.org/viewvc/tomcat/trunk/MERGE.txt?rev=1837736&r1=1837735&r2=1837736&view=diff ============================================================================== --- tomcat/trunk/MERGE.txt (original) +++ tomcat/trunk/MERGE.txt Thu Aug 9 14:40:29 2018 @@ -57,7 +57,7 @@ FileUpload Sub-tree: src/main/java/org/apache/commons/fileupload The SHA1 ID for the most recent commit to be merged to Tomcat is: -6c00d575a9521c386743891fd34bc5181174cc01 +b1498c9877d751f8bc4635a6f252ebdfcba28518 Note: Tomcat's copy of fileupload also includes classes copied manually (rather than svn copied) from Commons IO. Modified: tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/MultipartStream.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/MultipartStream.java?rev=1837736&r1=1837735&r2=1837736&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/MultipartStream.java (original) +++ tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/MultipartStream.java Thu Aug 9 14:40:29 2018 @@ -229,7 +229,7 @@ public class MultipartStream { /** * The table for Knuth-Morris-Pratt search algorithm. */ - private int[] boundaryTable; + private final int[] boundaryTable; /** * The length of the buffer used for processing the request. --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org