You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2019/05/03 16:22:57 UTC
[tomcat] branch master updated (d676a1e -> c337321)
This is an automated email from the ASF dual-hosted git repository.
markt pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git.
from d676a1e Update internal fork of Apache Commons Pool 2
new 154cf8f ws police
new c337321 Review diff to Commons FileUpload. Format changes to reduce diff.
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../org/apache/tomcat/util/http/fileupload/FileUploadBase.java | 5 ++---
.../apache/tomcat/util/http/fileupload/ParameterParser.java | 10 +++++-----
.../apache/tomcat/util/http/fileupload/disk/DiskFileItem.java | 5 ++---
webapps/docs/changelog.xml | 2 +-
4 files changed, 10 insertions(+), 12 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
[tomcat] 01/02: ws police
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 154cf8f439ec985650cf15f5d2050bda6ed12f6a
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Fri May 3 17:22:03 2019 +0100
ws police
---
webapps/docs/changelog.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index e75f345..8518b64 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -215,7 +215,7 @@
(2019-04-24) pick up some enhancements. (markt)
</update>
<update>
- Update the internal fork of Apache Commons DBCP 2 to dcdbc72
+ Update the internal fork of Apache Commons DBCP 2 to dcdbc72
(2019-04-24) to pick up some clean-up and enhancements. (markt)
</update>
<update>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
[tomcat] 02/02: Review diff to Commons FileUpload. Format changes
to reduce diff.
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit c33732159e28d073d456e1f832013ffd8702cd41
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Fri May 3 17:22:43 2019 +0100
Review diff to Commons FileUpload. Format changes to reduce diff.
---
.../org/apache/tomcat/util/http/fileupload/FileUploadBase.java | 5 ++---
.../apache/tomcat/util/http/fileupload/ParameterParser.java | 10 +++++-----
.../apache/tomcat/util/http/fileupload/disk/DiskFileItem.java | 5 ++---
3 files changed, 9 insertions(+), 11 deletions(-)
diff --git a/java/org/apache/tomcat/util/http/fileupload/FileUploadBase.java b/java/org/apache/tomcat/util/http/fileupload/FileUploadBase.java
index 8eb23c7..486434a 100644
--- a/java/org/apache/tomcat/util/http/fileupload/FileUploadBase.java
+++ b/java/org/apache/tomcat/util/http/fileupload/FileUploadBase.java
@@ -404,8 +404,7 @@ public abstract class FileUploadBase {
ParameterParser parser = new ParameterParser();
parser.setLowerCaseNames(true);
// Parameter parser can handle null input
- Map<String,String> params =
- parser.parse(pContentDisposition, ';');
+ Map<String, String> params = parser.parse(pContentDisposition, ';');
if (params.containsKey("filename")) {
fileName = params.get("filename");
if (fileName != null) {
@@ -447,7 +446,7 @@ public abstract class FileUploadBase {
ParameterParser parser = new ParameterParser();
parser.setLowerCaseNames(true);
// Parameter parser can handle null input
- Map<String,String> params = parser.parse(pContentDisposition, ';');
+ Map<String, String> params = parser.parse(pContentDisposition, ';');
fieldName = params.get("name");
if (fieldName != null) {
fieldName = fieldName.trim();
diff --git a/java/org/apache/tomcat/util/http/fileupload/ParameterParser.java b/java/org/apache/tomcat/util/http/fileupload/ParameterParser.java
index e0ccd91..061be67 100644
--- a/java/org/apache/tomcat/util/http/fileupload/ParameterParser.java
+++ b/java/org/apache/tomcat/util/http/fileupload/ParameterParser.java
@@ -226,7 +226,7 @@ public class ParameterParser {
*
* @return a map of name/value pairs
*/
- public Map<String,String> parse(final String str, char[] separators) {
+ public Map<String, String> parse(final String str, char[] separators) {
if (separators == null || separators.length == 0) {
return new HashMap<>();
}
@@ -253,7 +253,7 @@ public class ParameterParser {
*
* @return a map of name/value pairs
*/
- public Map<String,String> parse(final String str, char separator) {
+ public Map<String, String> parse(final String str, char separator) {
if (str == null) {
return new HashMap<>();
}
@@ -270,7 +270,7 @@ public class ParameterParser {
*
* @return a map of name/value pairs
*/
- public Map<String,String> parse(final char[] charArray, char separator) {
+ public Map<String, String> parse(final char[] charArray, char separator) {
if (charArray == null) {
return new HashMap<>();
}
@@ -289,7 +289,7 @@ public class ParameterParser {
*
* @return a map of name/value pairs
*/
- public Map<String,String> parse(
+ public Map<String, String> parse(
final char[] charArray,
int offset,
int length,
@@ -298,7 +298,7 @@ public class ParameterParser {
if (charArray == null) {
return new HashMap<>();
}
- HashMap<String,String> params = new HashMap<>();
+ HashMap<String, String> params = new HashMap<>();
this.chars = charArray;
this.pos = offset;
this.len = length;
diff --git a/java/org/apache/tomcat/util/http/fileupload/disk/DiskFileItem.java b/java/org/apache/tomcat/util/http/fileupload/disk/DiskFileItem.java
index 70ee565..38c783e 100644
--- a/java/org/apache/tomcat/util/http/fileupload/disk/DiskFileItem.java
+++ b/java/org/apache/tomcat/util/http/fileupload/disk/DiskFileItem.java
@@ -223,7 +223,7 @@ public class DiskFileItem
ParameterParser parser = new ParameterParser();
parser.setLowerCaseNames(true);
// Parameter parser can handle null input
- Map<String,String> params = parser.parse(getContentType(), ';');
+ Map<String, String> params = parser.parse(getContentType(), ';');
return params.get("charset");
}
@@ -572,8 +572,7 @@ public class DiskFileItem
tempDir = new File(System.getProperty("java.io.tmpdir"));
}
- String tempFileName =
- String.format("upload_%s_%s.tmp", UID, getUniqueId());
+ String tempFileName = String.format("upload_%s_%s.tmp", UID, getUniqueId());
tempFile = new File(tempDir, tempFileName);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org