Author: kkolinko
Date: Thu Feb 6 19:42:10 2014
New Revision: 1565419
URL: http://svn.apache.org/r1565419
Log:
Merged revisions r1565300-r1565416 from tomcat/trunk:
Improve handling of file upload errors. Display a message instead of error 500
page.
Simplify parts handling code, as it is known that Tomcat takes care of them
when recycling a request.
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/catalina/manager/HTMLManagerServlet.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
Merged /tomcat/trunk:r1565300-1565416
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/manager/HTMLManagerServlet.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/manager/HTMLManagerServlet.java?rev=1565419&r1=1565418&r2=1565419&view=diff
==============================================================================
---
tomcat/tc7.0.x/trunk/java/org/apache/catalina/manager/HTMLManagerServlet.java
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/catalina/manager/HTMLManagerServlet.java
Thu Feb 6 19:42:10 2014
@@ -27,11 +27,9 @@ import java.net.UnknownHostException;
import java.text.MessageFormat;
import java.util.ArrayList;
import java.util.Arrays;
-import java.util.Collection;
import java.util.Collections;
import java.util.Comparator;
import java.util.Date;
-import java.util.Iterator;
import java.util.List;
import java.util.Locale;
import java.util.Map;
@@ -230,33 +228,18 @@ public final class HTMLManagerServlet ex
list(request, response, message, smClient);
}
- protected String upload(HttpServletRequest request, StringManager smClient)
- throws IOException, ServletException {
+ protected String upload(HttpServletRequest request, StringManager
smClient) {
String message = "";
- Part warPart = null;
- String filename = null;
-
- Collection<Part> parts = request.getParts();
- Iterator<Part> iter = parts.iterator();
-
try {
- while (iter.hasNext()) {
- Part part = iter.next();
- if (part.getName().equals("deployWar") && warPart == null) {
- warPart = part;
- } else {
- part.delete();
- }
- }
-
while (true) {
+ Part warPart = request.getPart("deployWar");
if (warPart == null) {
message = smClient.getString(
"htmlManagerServlet.deployUploadNoFile");
break;
}
- filename =
+ String filename =
extractFilename(warPart.getHeader("Content-Disposition"));
if (!filename.toLowerCase(Locale.ENGLISH).endsWith(".war")) {
message = smClient.getString(
@@ -309,11 +292,6 @@ public final class HTMLManagerServlet ex
message = smClient.getString
("htmlManagerServlet.deployUploadFail", e.getMessage());
log(message, e);
- } finally {
- if (warPart != null) {
- warPart.delete();
- }
- warPart = null;
}
return message;
}
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=1565419&r1=1565418&r2=1565419&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Thu Feb 6 19:42:10 2014
@@ -262,6 +262,12 @@
Correct links to the Tomcat mailing lists in the ROOT web application.
(kkolinko)
</fix>
+ <fix>
+ In Manager web application improve handling of file upload errors.
+ Display a message instead of error 500 page. Simplify parts handling
+ code, as it is known that Tomcat takes care of them when recycling a
+ request. (kkolinko)
+ </fix>
</changelog>
</subsection>
<subsection name="Extras">
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
