Author: kkolinko
Date: Fri Jan 15 13:39:03 2016
New Revision: 1724803
URL: http://svn.apache.org/viewvc?rev=1724803&view=rev
Log:
For https://bz.apache.org/bugzilla/show_bug.cgi?id=58836
Optimize mergeValues(). The method arguments are known to be String[], so do
that branch first. No functional change.
Modified:
tomcat/tc8.0.x/trunk/java/org/apache/catalina/core/ApplicationHttpRequest.java
Modified:
tomcat/tc8.0.x/trunk/java/org/apache/catalina/core/ApplicationHttpRequest.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/core/ApplicationHttpRequest.java?rev=1724803&r1=1724802&r2=1724803&view=diff
==============================================================================
---
tomcat/tc8.0.x/trunk/java/org/apache/catalina/core/ApplicationHttpRequest.java
(original)
+++
tomcat/tc8.0.x/trunk/java/org/apache/catalina/core/ApplicationHttpRequest.java
Fri Jan 15 13:39:03 2016
@@ -837,25 +837,23 @@ class ApplicationHttpRequest extends Htt
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
+ } else if (values1 instanceof String[]) {
+ for (String value : (String[]) values1) {
+ results.add(value);
+ }
+ } else { // String
results.add(values1.toString());
+ }
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
+ } else if (values2 instanceof String[]) {
+ for (String value : (String[]) values2) {
+ results.add(value);
+ }
+ } else { // String
results.add(values2.toString());
+ }
String values[] = new String[results.size()];
return results.toArray(values);
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
