Author: kkolinko
Date: Thu Feb 6 15:11:35 2014
New Revision: 1565300
URL: http://svn.apache.org/r1565300
Log:
Followup to r1565163
Catch exceptions thrown by getParts() and report them as other upload errors
(in the message box on the HTML page).
Without this an uncaught exception resulted in Error 500.
I am removing warPart cleanup code, because Tomcat already does such cleanup
when Request is recycled
(Tomcat code deletes all parts in a request, and part.delete() could throw an
IOException).
Modified:
tomcat/trunk/java/org/apache/catalina/manager/HTMLManagerServlet.java
Modified: tomcat/trunk/java/org/apache/catalina/manager/HTMLManagerServlet.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/manager/HTMLManagerServlet.java?rev=1565300&r1=1565299&r2=1565300&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/manager/HTMLManagerServlet.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/manager/HTMLManagerServlet.java Thu
Feb 6 15:11:35 2014
@@ -234,17 +234,16 @@ 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;
+ try {
+ Part warPart = null;
+ String filename = null;
- Collection<Part> parts = request.getParts();
- Iterator<Part> iter = parts.iterator();
+ 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) {
@@ -312,11 +311,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;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
