Author: markt
Date: Fri Mar 15 12:34:48 2013
New Revision: 1456932
URL: http://svn.apache.org/r1456932
Log:
Review the diff to FileUpload trunk and better our fork
Modified:
tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/ParameterParser.java
tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/util/mime/QuotedPrintableDecoder.java
Modified:
tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/ParameterParser.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/ParameterParser.java?rev=1456932&r1=1456931&r2=1456932&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/ParameterParser.java
(original)
+++
tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/ParameterParser.java
Fri Mar 15 12:34:48 2013
@@ -266,24 +266,24 @@ public class ParameterParser {
* Extracts a map of name/value pairs from the given array of
* characters. Names are expected to be unique.
*
- * @param inputChars the array of characters that contains a sequence of
+ * @param chars the array of characters that contains a sequence of
* name/value pairs
* @param separator the name/value pairs separator
*
* @return a map of name/value pairs
*/
- public Map<String,String> parse(final char[] inputChars, char separator) {
- if (inputChars == null) {
+ public Map<String,String> parse(final char[] chars, char separator) {
+ if (chars == null) {
return new HashMap<>();
}
- return parse(inputChars, 0, inputChars.length, separator);
+ return parse(chars, 0, chars.length, separator);
}
/**
* Extracts a map of name/value pairs from the given array of
* characters. Names are expected to be unique.
*
- * @param inputChars the array of characters that contains a sequence of
+ * @param chars the array of characters that contains a sequence of
* name/value pairs
* @param offset - the initial offset.
* @param length - the length.
@@ -292,16 +292,16 @@ public class ParameterParser {
* @return a map of name/value pairs
*/
public Map<String,String> parse(
- final char[] inputChars,
+ final char[] chars,
int offset,
int length,
char separator) {
- if (inputChars == null) {
+ if (chars == null) {
return new HashMap<>();
}
HashMap<String,String> params = new HashMap<>();
- this.chars = inputChars;
+ this.chars = chars;
this.pos = offset;
this.len = length;
Modified:
tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/util/mime/QuotedPrintableDecoder.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/util/mime/QuotedPrintableDecoder.java?rev=1456932&r1=1456931&r2=1456932&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/util/mime/QuotedPrintableDecoder.java
(original)
+++
tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/util/mime/QuotedPrintableDecoder.java
Fri Mar 15 12:34:48 2013
@@ -38,7 +38,7 @@ final class QuotedPrintableDecoder {
private static final int OUT_SHIFT = 4;
/**
- * The decoding table size.
+ * the decoding table size.
*/
private static final int DECODING_TABLE_SIZE = 128;
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
