Author: markt
Date: Thu Jan 14 19:48:51 2016
New Revision: 1724678
URL: http://svn.apache.org/viewvc?rev=1724678&view=rev
Log:
Simplify
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=1724678&r1=1724677&r2=1724678&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/ApplicationHttpRequest.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/core/ApplicationHttpRequest.java Thu
Jan 14 19:48:51 2016
@@ -838,35 +838,28 @@ class ApplicationHttpRequest extends Htt
* @param values1 First set of values
* @param values2 Second set of values
*/
- protected String[] mergeValues(Object values1, Object values2) {
+ private String[] mergeValues(String[] values1, String[] values2) {
ArrayList<Object> results = new ArrayList<>();
if (values1 == null) {
// Skip - nothing to merge
- } else if (values1 instanceof String)
- results.add(values1);
- else if (values1 instanceof String[]) {
- String values[] = (String[]) values1;
- for (int i = 0; i < values.length; i++)
- results.add(values[i]);
- } else
- results.add(values1.toString());
+ } else {
+ for (String value : values1) {
+ results.add(value);
+ }
+ }
if (values2 == null) {
// Skip - nothing to merge
- } else if (values2 instanceof String)
- results.add(values2);
- else if (values2 instanceof String[]) {
- String values[] = (String[]) values2;
- for (int i = 0; i < values.length; i++)
- results.add(values[i]);
- } else
- results.add(values2.toString());
+ } else {
+ for (String value : values2) {
+ results.add(value);
+ }
+ }
String values[] = new String[results.size()];
return results.toArray(values);
-
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
