You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@struts.apache.org by cr...@locus.apache.org on 2000/12/28 03:09:12 UTC
cvs commit: jakarta-struts/src/share/org/apache/struts/taglib/bean CookieTag.java HeaderTag.java
craigmcc 00/12/27 18:09:11
Modified: src/share/org/apache/struts/taglib/bean CookieTag.java
HeaderTag.java
Log:
Convert to non-synchronized collections for local variables. No
functionality change.
Revision Changes Path
1.6 +8 -8 jakarta-struts/src/share/org/apache/struts/taglib/bean/CookieTag.java
Index: CookieTag.java
===================================================================
RCS file: /home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/bean/CookieTag.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- CookieTag.java 2000/10/30 06:02:09 1.5
+++ CookieTag.java 2000/12/28 02:09:08 1.6
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/bean/CookieTag.java,v 1.5 2000/10/30 06:02:09 craigmcc Exp $
- * $Revision: 1.5 $
- * $Date: 2000/10/30 06:02:09 $
+ * $Header: /home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/bean/CookieTag.java,v 1.6 2000/12/28 02:09:08 craigmcc Exp $
+ * $Revision: 1.6 $
+ * $Date: 2000/12/28 02:09:08 $
*
* ====================================================================
*
@@ -65,7 +65,7 @@
import java.io.IOException;
import java.lang.reflect.InvocationTargetException;
-import java.util.Vector;
+import java.util.ArrayList;
import javax.servlet.http.Cookie;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.jsp.JspException;
@@ -82,7 +82,7 @@
* cookie received with this request.
*
* @author Craig R. McClanahan
- * @version $Revision: 1.5 $ $Date: 2000/10/30 06:02:09 $
+ * @version $Revision: 1.6 $ $Date: 2000/12/28 02:09:08 $
*/
public class CookieTag extends TagSupport {
@@ -153,7 +153,7 @@
public int doStartTag() throws JspException {
// Retrieve the required cookie value(s)
- Vector values = new Vector();
+ ArrayList values = new ArrayList();
Cookie cookies[] =
((HttpServletRequest) pageContext.getRequest()).getCookies();
if (cookies == null)
@@ -161,7 +161,7 @@
for (int i = 0; i < cookies.length; i++) {
if (name.equals(cookies[i].getName()))
- values.addElement(cookies[i]);
+ values.add(cookies[i]);
}
if (values.size() < 1) {
JspException e = new JspException
@@ -173,7 +173,7 @@
// Expose an appropriate variable containing these results
if (multiple == null) {
- Cookie cookie = (Cookie) values.elementAt(0);
+ Cookie cookie = (Cookie) values.get(0);
pageContext.setAttribute(id, cookie);
} else {
cookies = new Cookie[values.size()];
1.5 +7 -7 jakarta-struts/src/share/org/apache/struts/taglib/bean/HeaderTag.java
Index: HeaderTag.java
===================================================================
RCS file: /home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/bean/HeaderTag.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- HeaderTag.java 2000/10/30 06:02:11 1.4
+++ HeaderTag.java 2000/12/28 02:09:09 1.5
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/bean/HeaderTag.java,v 1.4 2000/10/30 06:02:11 craigmcc Exp $
- * $Revision: 1.4 $
- * $Date: 2000/10/30 06:02:11 $
+ * $Header: /home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/bean/HeaderTag.java,v 1.5 2000/12/28 02:09:09 craigmcc Exp $
+ * $Revision: 1.5 $
+ * $Date: 2000/12/28 02:09:09 $
*
* ====================================================================
*
@@ -65,8 +65,8 @@
import java.io.IOException;
import java.lang.reflect.InvocationTargetException;
+import java.util.ArrayList;
import java.util.Enumeration;
-import java.util.Vector;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.jsp.JspException;
import javax.servlet.jsp.PageContext;
@@ -82,7 +82,7 @@
* header received with this request.
*
* @author Craig R. McClanahan
- * @version $Revision: 1.4 $ $Date: 2000/10/30 06:02:11 $
+ * @version $Revision: 1.5 $ $Date: 2000/12/28 02:09:09 $
*/
public class HeaderTag extends TagSupport {
@@ -168,11 +168,11 @@
}
// Deal with multiple header values
- Vector values = new Vector();
+ ArrayList values = new ArrayList();
Enumeration items =
((HttpServletRequest) pageContext.getRequest()).getHeaders(name);
while (items.hasMoreElements())
- values.addElement(items.nextElement());
+ values.add(items.nextElement());
String headers[] = new String[values.size()];
if (headers.length == 0) {
JspException e = new JspException