svn commit: r1656331 - /tomcat/trunk/java/org/apache/catalina/core/ApplicationHttpRequest.java

[fschumacher]

Author: fschumacher
Date: Sun Feb  1 17:04:39 2015
New Revision: 1656331

URL: http://svn.apache.org/r1656331
Log:
We know, that we only store String[] instances as
values in parameters-map, so no need to check for other types.

Modified:
    tomcat/trunk/java/org/apache/catalina/core/ApplicationHttpRequest.java

Modified: tomcat/trunk/java/org/apache/catalina/core/ApplicationHttpRequest.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/ApplicationHttpRequest.java?rev=1656331&r1=1656330&r2=1656331&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/ApplicationHttpRequest.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/core/ApplicationHttpRequest.java Sun 
Feb  1 17:04:39 2015
@@ -366,15 +366,11 @@ class ApplicationHttpRequest extends Htt
 
         parseParameters();
 
-        Object value = parameters.get(name);
-        if (value == null)
-            return (null);
-        else if (value instanceof String[])
-            return (((String[]) value)[0]);
-        else if (value instanceof String)
-            return ((String) value);
-        else
-            return (value.toString());
+        String[] value = parameters.get(name);
+        if (value == null) {
+            return null;
+        }
+        return value[0];
 
     }
 
@@ -414,20 +410,7 @@ class ApplicationHttpRequest extends Htt
     public String[] getParameterValues(String name) {
 
         parseParameters();
-        Object value = parameters.get(name);
-        if (value == null)
-            return null;
-        else if (value instanceof String[])
-            return ((String[]) value);
-        else if (value instanceof String) {
-            String values[] = new String[1];
-            values[0] = (String) value;
-            return (values);
-        } else {
-            String values[] = new String[1];
-            values[0] = value.toString();
-            return (values);
-        }
+        return parameters.get(name);
 
     }
 



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org