Author: markt
Date: Thu Mar 14 20:44:02 2013
New Revision: 1456663
URL: http://svn.apache.org/r1456663
Log:
getFilename() -> getSubmittedFileName() in preparation for Servlet 3.1
Based on a patch by Nick Williams.
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/java/org/apache/catalina/core/ApplicationPart.java
Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
Merged /tomcat/trunk:r1456657
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=1456663&r1=1456662&r2=1456663&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 Thu
Mar 14 20:44:02 2013
@@ -2733,7 +2733,7 @@ public class Request
for (FileItem item : items) {
ApplicationPart part = new ApplicationPart(item, mce);
parts.add(part);
- if (part.getFilename() == null) {
+ if (part.getSubmittedFileName() == null) {
String name = part.getName();
String value = null;
try {
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/ApplicationPart.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/ApplicationPart.java?rev=1456663&r1=1456662&r2=1456663&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/ApplicationPart.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/ApplicationPart.java Thu
Mar 14 20:44:02 2013
@@ -128,10 +128,22 @@ public class ApplicationPart implements
return fileItem.getString(encoding);
}
- /*
- * Adapted from FileUploadBase.getFileName()
+ /**
+ * Calls {@link #getSubmittedFileName()}.
+ *
+ * @deprecated Use {@link #getSubmittedFileName()} from Servlet 3.1
instead.
+ * This method will be removed in Tomcat 8.
*/
+ @Deprecated
public String getFilename() {
+ return getSubmittedFileName();
+ }
+
+ /**
+ * Adapted from FileUploadBase.getFileName(). Method name chosen to be
+ * consistent with Servlet 3.1.
+ */
+ public String getSubmittedFileName() {
String fileName = null;
String cd = getHeader("Content-Disposition");
if (cd != null) {
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
