Author: kkolinko
Date: Fri Sep 12 23:28:22 2014
New Revision: 1624680
URL: http://svn.apache.org/r1624680
Log:
Implement a TODO: change return value of AnnotationEntry.getElementValuePairs()
from an array to a list.
As all usages are known and constructor of ElementValuePair class is not
accessible from outside (package-visible), I think it is OK to skip defensive
copying.
It is merge of r1624573, r1624679 from tomcat/trunk.
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/ContextConfig.java
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/ (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/AnnotationEntry.java
Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
Merged /tomcat/trunk:r1624573,1624679
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/ContextConfig.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/ContextConfig.java?rev=1624680&r1=1624679&r2=1624680&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/ContextConfig.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/ContextConfig.java
Fri Sep 12 23:28:22 2014
@@ -2314,7 +2314,7 @@ public class ContextConfig implements Li
AnnotationEntry ae, WebXml fragment) {
String servletName = null;
// must search for name s. Spec Servlet API 3.0 - 8.2.3.3.n.ii page 81
- ElementValuePair[] evps = ae.getElementValuePairs();
+ List<ElementValuePair> evps = ae.getElementValuePairs();
for (ElementValuePair evp : evps) {
String name = evp.getNameString();
if ("name".equals(name)) {
@@ -2341,7 +2341,7 @@ public class ContextConfig implements Li
boolean urlPatternsSet = false;
String[] urlPatterns = null;
- // ElementValuePair[] evps = ae.getElementValuePairs();
+ // List<ElementValuePair> evps = ae.getElementValuePairs();
for (ElementValuePair evp : evps) {
String name = evp.getNameString();
if ("value".equals(name) || "urlPatterns".equals(name)) {
@@ -2424,7 +2424,7 @@ public class ContextConfig implements Li
AnnotationEntry ae, WebXml fragment) {
String filterName = null;
// must search for name s. Spec Servlet API 3.0 - 8.2.3.3.n.ii page 81
- ElementValuePair[] evps = ae.getElementValuePairs();
+ List<ElementValuePair> evps = ae.getElementValuePairs();
for (ElementValuePair evp : evps) {
String name = evp.getNameString();
if ("filterName".equals(name)) {
@@ -2583,8 +2583,8 @@ public class ContextConfig implements Li
((ArrayElementValue) ev).getElementValuesArray();
for (ElementValue value : arrayValues) {
if (value instanceof AnnotationElementValue) {
- ElementValuePair[] evps = ((AnnotationElementValue)
- value).getAnnotationEntry().getElementValuePairs();
+ List<ElementValuePair> evps = ((AnnotationElementValue)
value)
+ .getAnnotationEntry().getElementValuePairs();
String initParamName = null;
String initParamValue = null;
for (ElementValuePair evp : evps) {
Propchange: tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/
------------------------------------------------------------------------------
Merged /tomcat/trunk/java/org/apache/tomcat/util/bcel:r1624573
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/AnnotationEntry.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/AnnotationEntry.java?rev=1624680&r1=1624679&r2=1624680&view=diff
==============================================================================
---
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/AnnotationEntry.java
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/AnnotationEntry.java
Fri Sep 12 23:28:22 2014
@@ -73,8 +73,7 @@ public class AnnotationEntry implements
/**
* @return the element value pairs in this annotation entry
*/
- public ElementValuePair[] getElementValuePairs() {
- // TODO return List
- return element_value_pairs.toArray(new
ElementValuePair[element_value_pairs.size()]);
+ public List<ElementValuePair> getElementValuePairs() {
+ return element_value_pairs;
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
