Author: rjung
Date: Tue Dec 16 11:05:27 2014
New Revision: 1645913
URL: http://svn.apache.org/r1645913
Log:
Use Map instead of HashMap in RequestDescriptor.
Backport of r1645743 from trunk.
Modified:
tomcat/tc8.0.x/trunk/ (props changed)
tomcat/tc8.0.x/trunk/test/org/apache/catalina/startup/TomcatBaseTest.java
tomcat/tc8.0.x/trunk/test/org/apache/coyote/ajp/TestAbstractAjpProcessor.java
Propchange: tomcat/tc8.0.x/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Dec 16 11:05:27 2014
@@ -1 +1 @@
-/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886,1644890,1644892
,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685
+/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886,1644890,1644892
,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743
Modified:
tomcat/tc8.0.x/trunk/test/org/apache/catalina/startup/TomcatBaseTest.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/test/org/apache/catalina/startup/TomcatBaseTest.java?rev=1645913&r1=1645912&r2=1645913&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/test/org/apache/catalina/startup/TomcatBaseTest.java
(original)
+++ tomcat/tc8.0.x/trunk/test/org/apache/catalina/startup/TomcatBaseTest.java
Tue Dec 16 11:05:27 2014
@@ -238,46 +238,46 @@ public abstract class TomcatBaseTest ext
public static final class RequestDescriptor {
- private final HashMap<String, String> requestInfo =
+ private final Map<String, String> requestInfo =
new HashMap<String, String>();
- private final HashMap<String, String> contextInitParameters =
+ private final Map<String, String> contextInitParameters =
new HashMap<String, String>();
- private final HashMap<String, String> contextAttributes =
+ private final Map<String, String> contextAttributes =
new HashMap<String, String>();
- private final HashMap<String, String> headers =
+ private final Map<String, String> headers =
new HashMap<String, String>();
- private final HashMap<String, String> attributes =
+ private final Map<String, String> attributes =
new HashMap<String, String>();
- private final HashMap<String, String> params =
+ private final Map<String, String> params =
new HashMap<String, String>();
- private final HashMap<String, String> sessionAttributes =
+ private final Map<String, String> sessionAttributes =
new HashMap<String, String>();
- public HashMap<String, String> getRequestInfo() {
+ public Map<String, String> getRequestInfo() {
return requestInfo;
}
- public HashMap<String, String> getContextInitParameters() {
+ public Map<String, String> getContextInitParameters() {
return contextInitParameters;
}
- public HashMap<String, String> getContextAttributes() {
+ public Map<String, String> getContextAttributes() {
return contextAttributes;
}
- public HashMap<String, String> getHeaders() {
+ public Map<String, String> getHeaders() {
return headers;
}
- public HashMap<String, String> getAttributes() {
+ public Map<String, String> getAttributes() {
return attributes;
}
- public HashMap<String, String> getParams() {
+ public Map<String, String> getParams() {
return params;
}
- public HashMap<String, String> getSessionAttributes() {
+ public Map<String, String> getSessionAttributes() {
return sessionAttributes;
}
@@ -338,8 +338,8 @@ public abstract class TomcatBaseTest ext
}
public void compare (RequestDescriptor request) {
- HashMap<String, String> base;
- HashMap<String, String> cmp;
+ Map<String, String> base;
+ Map<String, String> cmp;
base = request.getRequestInfo();
cmp = this.getRequestInfo();
for (String name: base.keySet()) {
Modified:
tomcat/tc8.0.x/trunk/test/org/apache/coyote/ajp/TestAbstractAjpProcessor.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/test/org/apache/coyote/ajp/TestAbstractAjpProcessor.java?rev=1645913&r1=1645912&r2=1645913&view=diff
==============================================================================
---
tomcat/tc8.0.x/trunk/test/org/apache/coyote/ajp/TestAbstractAjpProcessor.java
(original)
+++
tomcat/tc8.0.x/trunk/test/org/apache/coyote/ajp/TestAbstractAjpProcessor.java
Tue Dec 16 11:05:27 2014
@@ -23,6 +23,7 @@ import java.util.ArrayList;
import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
+import java.util.Map;
import javax.servlet.ServletContext;
import javax.servlet.ServletException;
@@ -66,12 +67,12 @@ public class TestAbstractAjpProcessor ex
private void doSnoopTest(RequestDescriptor desc) throws Exception {
- HashMap<String, String> requestInfo = desc.getRequestInfo();
- HashMap<String, String> contextInitParameters =
desc.getContextInitParameters();
- HashMap<String, String> contextAttributes =
desc.getContextAttributes();
- HashMap<String, String> headers = desc.getHeaders();
- HashMap<String, String> attributes = desc.getAttributes();
- HashMap<String, String> params = desc.getParams();
+ Map<String, String> requestInfo = desc.getRequestInfo();
+ Map<String, String> contextInitParameters =
desc.getContextInitParameters();
+ Map<String, String> contextAttributes = desc.getContextAttributes();
+ Map<String, String> headers = desc.getHeaders();
+ Map<String, String> attributes = desc.getAttributes();
+ Map<String, String> params = desc.getParams();
Tomcat tomcat = getTomcatInstance();
@@ -91,7 +92,7 @@ public class TestAbstractAjpProcessor ex
}
String value;
- HashMap<String, String> savedRequestInfo = new HashMap<String,
String>();
+ Map<String, String> savedRequestInfo = new HashMap<String, String>();
for (String name: requestInfo.keySet()) {
value = requestInfo.get(name);
switch (name) {
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
