svn commit: r1565253 - /commons/proper/fileupload/trunk/src/main/java/org/apache/commons/fileupload/ParameterParser.java

[gg...@apache.org]

Author: ggregory
Date: Thu Feb  6 13:48:16 2014
New Revision: 1565253

URL: http://svn.apache.org/r1565253
Log:
The parameter chars is hiding a field from type ParameterParser.

Modified:
    commons/proper/fileupload/trunk/src/main/java/org/apache/commons/fileupload/ParameterParser.java

Modified: commons/proper/fileupload/trunk/src/main/java/org/apache/commons/fileupload/ParameterParser.java
URL: http://svn.apache.org/viewvc/commons/proper/fileupload/trunk/src/main/java/org/apache/commons/fileupload/ParameterParser.java?rev=1565253&r1=1565252&r2=1565253&view=diff
==============================================================================
--- commons/proper/fileupload/trunk/src/main/java/org/apache/commons/fileupload/ParameterParser.java (original)
+++ commons/proper/fileupload/trunk/src/main/java/org/apache/commons/fileupload/ParameterParser.java Thu Feb  6 13:48:16 2014
@@ -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 chars the array of characters that contains a sequence of
+     * @param charArray 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[] chars, char separator) {
-        if (chars == null) {
+    public Map<String, String> parse(final char[] charArray, char separator) {
+        if (charArray == null) {
             return new HashMap<String, String>();
         }
-        return parse(chars, 0, chars.length, separator);
+        return parse(charArray, 0, charArray.length, separator);
     }
 
     /**
      * Extracts a map of name/value pairs from the given array of
      * characters. Names are expected to be unique.
      *
-     * @param chars the array of characters that contains a sequence of
+     * @param charArray 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[] chars,
+        final char[] charArray,
         int offset,
         int length,
         char separator) {
 
-        if (chars == null) {
+        if (charArray == null) {
             return new HashMap<String, String>();
         }
         HashMap<String, String> params = new HashMap<String, String>();
-        this.chars = chars;
+        this.chars = charArray;
         this.pos = offset;
         this.len = length;
 
@@ -311,7 +311,7 @@ public class ParameterParser {
             paramName = parseToken(new char[] {
                     '=', separator });
             paramValue = null;
-            if (hasChar() && (chars[pos] == '=')) {
+            if (hasChar() && (charArray[pos] == '=')) {
                 pos++; // skip '='
                 paramValue = parseQuotedToken(new char[] {
                         separator });
@@ -324,7 +324,7 @@ public class ParameterParser {
                     }
                 }
             }
-            if (hasChar() && (chars[pos] == separator)) {
+            if (hasChar() && (charArray[pos] == separator)) {
                 pos++; // skip separator
             }
             if ((paramName != null) && (paramName.length() > 0)) {