Author: kkolinko
Date: Mon Jul 2 22:43:32 2012
New Revision: 1356509
URL: http://svn.apache.org/viewvc?rev=1356509&view=rev
Log:
Merged revision 1356505 from tomcat/trunk:
Automatically delete temporary files used by Servlet 3.0 file upload when
request is recycled.
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/catalina/connector/Request.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
Merged /tomcat/trunk:r1356505
Modified: tomcat/tc7.0.x/trunk/java/org/apache/catalina/connector/Request.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/connector/Request.java?rev=1356509&r1=1356508&r2=1356509&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/connector/Request.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/connector/Request.java Mon
Jul 2 22:43:32 2012
@@ -470,7 +470,16 @@ public class Request
subject = null;
sessionParsed = false;
parametersParsed = false;
- parts = null;
+ if (parts != null) {
+ for (Part part: parts) {
+ try {
+ part.delete();
+ } catch (IOException ignored) {
+ // ApplicationPart.delete() never throws an IOEx
+ }
+ }
+ parts = null;
+ }
partsParseException = null;
cookiesParsed = false;
locales.clear();
Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1356509&r1=1356508&r2=1356509&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Mon Jul 2 22:43:32 2012
@@ -53,6 +53,18 @@
They eventually become mixed with the numbered issues. (I.e., numbered
issues to not "pop up" wrt. others).
-->
+<section name="Tomcat 7.0.30 (markt)">
+ <subsection name="Catalina">
+ <changelog>
+ <fix>
+ Automatically delete temporary files used by Servlet 3.0 file
+ upload (for parts which size is greater than
+ <code>file-size-threshold</code> option in web.xml)
+ when request processing completes. (kkolinko)
+ </fix>
+ </changelog>
+ </subsection>
+</section>
<section name="Tomcat 7.0.29 (markt)">
<subsection name="Catalina">
<changelog>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
