Author: kkolinko
Date: Thu Feb 6 19:29:48 2014
New Revision: 1565416
URL: http://svn.apache.org/r1565416
Log:
Simplify code.
There is no need to iterate over parts and cleanup them, Tomcat takes care of
that in Request.recycle().
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=1565416&r1=1565415&r2=1565416&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/manager/HTMLManagerServlet.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/manager/HTMLManagerServlet.java Thu
Feb 6 19:29:48 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.Set;
@@ -238,28 +236,14 @@ public final class HTMLManagerServlet ex
String message = "";
try {
- Part warPart = null;
- String filename = null;
-
- Collection<Part> parts = request.getParts();
- Iterator<Part> iter = parts.iterator();
-
- 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 = warPart.getSubmittedFileName();
+ String filename = warPart.getSubmittedFileName();
if (!filename.toLowerCase(Locale.ENGLISH).endsWith(".war")) {
message = smClient.getString(
"htmlManagerServlet.deployUploadNotWar", filename);
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
