This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/main by this push:
new 7eab11a Align with Commons FileUpload source
7eab11a is described below
commit 7eab11a932dbc41df9bfa3aa38a6455246841656
Author: Mark Thomas <[email protected]>
AuthorDate: Thu Sep 2 09:28:24 2021 +0100
Align with Commons FileUpload source
---
java/org/apache/tomcat/util/http/fileupload/package-info.java | 1 -
.../tomcat/util/http/fileupload/servlet/ServletRequestContext.java | 4 ++--
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/java/org/apache/tomcat/util/http/fileupload/package-info.java
b/java/org/apache/tomcat/util/http/fileupload/package-info.java
index aea8293..f13b598 100644
--- a/java/org/apache/tomcat/util/http/fileupload/package-info.java
+++ b/java/org/apache/tomcat/util/http/fileupload/package-info.java
@@ -15,7 +15,6 @@
* limitations under the License.
*/
-
/**
* <p><b>NOTE:</b> This code has been copied from commons-fileupload trunk
* 1.3 and commons-io 1.4 and package renamed to avoid clashes with
diff --git
a/java/org/apache/tomcat/util/http/fileupload/servlet/ServletRequestContext.java
b/java/org/apache/tomcat/util/http/fileupload/servlet/ServletRequestContext.java
index e43440c..abf4008 100644
---
a/java/org/apache/tomcat/util/http/fileupload/servlet/ServletRequestContext.java
+++
b/java/org/apache/tomcat/util/http/fileupload/servlet/ServletRequestContext.java
@@ -110,8 +110,8 @@ public class ServletRequestContext implements UploadContext
{
@Override
public String toString() {
return String.format("ContentLength=%s, ContentType=%s",
- Long.valueOf(this.contentLength()),
- this.getContentType());
+ Long.valueOf(this.contentLength()),
+ this.getContentType());
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]