You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by "Craig R. McClanahan" <cr...@locus.apache.org> on 2000/07/06 20:51:33 UTC
cvs commit: jakarta-tomcat/proposals/catalina/src/share/org/apache/tomcat/connector HttpResponseBase.java
craigmcc 00/07/06 11:51:33
Modified: proposals/catalina/src/share/org/apache/tomcat
HttpResponse.java Response.java
proposals/catalina/src/share/org/apache/tomcat/connector
HttpResponseBase.java
Log:
Make HttpResponse.getHeaderNames() and HttpResponse.getHeaderValues()
return string arrays instead of enumerations, consistent with all of the
other method calls that return collections in Catalina.
Revision Changes Path
1.3 +10 -13 jakarta-tomcat/proposals/catalina/src/share/org/apache/tomcat/HttpResponse.java
Index: HttpResponse.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat/proposals/catalina/src/share/org/apache/tomcat/HttpResponse.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- HttpResponse.java 2000/04/17 18:39:47 1.2
+++ HttpResponse.java 2000/07/06 18:51:32 1.3
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-tomcat/proposals/catalina/src/share/org/apache/tomcat/HttpResponse.java,v 1.2 2000/04/17 18:39:47 craigmcc Exp $
- * $Revision: 1.2 $
- * $Date: 2000/04/17 18:39:47 $
+ * $Header: /home/cvs/jakarta-tomcat/proposals/catalina/src/share/org/apache/tomcat/HttpResponse.java,v 1.3 2000/07/06 18:51:32 craigmcc Exp $
+ * $Revision: 1.3 $
+ * $Date: 2000/07/06 18:51:32 $
*
* ====================================================================
*
@@ -65,16 +65,13 @@
package org.apache.tomcat;
-import java.util.Enumeration;
-
-
/**
* An <b>HttpResponse</b> is the Tomcat-internal facade for an
* <code>HttpServletResponse</code> that is to be produced,
* based on the processing of a corresponding <code>HttpRequest</code>.
*
* @author Craig R. McClanahan
- * @version $Revision: 1.2 $ $Date: 2000/04/17 18:39:47 $
+ * @version $Revision: 1.3 $ $Date: 2000/07/06 18:51:32 $
*/
public interface HttpResponse
@@ -96,20 +93,20 @@
/**
- * Return an enumeration all the header names set for this response, or
- * an empty Enumeration if no headers have been set.
+ * Return an array of all the header names set for this response, or
+ * a zero-length array if no headers have been set.
*/
- public Enumeration getHeaderNames();
+ public String[] getHeaderNames();
/**
- * Return an enumeration of all the header values associated with the
- * specified header name, or an empty enumeration if there are no such
+ * Return an array of all the header values associated with the
+ * specified header name, or an zero-length array if there are no such
* header values.
*
* @param name Header name to look up
*/
- public Enumeration getHeaderValues(String name);
+ public String[] getHeaderValues(String name);
/**
1.10 +4 -5 jakarta-tomcat/proposals/catalina/src/share/org/apache/tomcat/Response.java
Index: Response.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat/proposals/catalina/src/share/org/apache/tomcat/Response.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- Response.java 2000/06/23 01:38:28 1.9
+++ Response.java 2000/07/06 18:51:32 1.10
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-tomcat/proposals/catalina/src/share/org/apache/tomcat/Response.java,v 1.9 2000/06/23 01:38:28 craigmcc Exp $
- * $Revision: 1.9 $
- * $Date: 2000/06/23 01:38:28 $
+ * $Header: /home/cvs/jakarta-tomcat/proposals/catalina/src/share/org/apache/tomcat/Response.java,v 1.10 2000/07/06 18:51:32 craigmcc Exp $
+ * $Revision: 1.10 $
+ * $Date: 2000/07/06 18:51:32 $
*
* ====================================================================
*
@@ -68,7 +68,6 @@
import java.io.IOException;
import java.io.OutputStream;
import java.io.PrintWriter;
-import java.util.Enumeration;
import javax.servlet.ServletException;
import javax.servlet.ServletOutputStream;
import javax.servlet.ServletResponse;
@@ -80,7 +79,7 @@
* based on the processing of a corresponding <code>Request</code>.
*
* @author Craig R. McClanahan
- * @version $Revision: 1.9 $ $Date: 2000/06/23 01:38:28 $
+ * @version $Revision: 1.10 $ $Date: 2000/07/06 18:51:32 $
*/
public interface Response {
1.12 +24 -15 jakarta-tomcat/proposals/catalina/src/share/org/apache/tomcat/connector/HttpResponseBase.java
Index: HttpResponseBase.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat/proposals/catalina/src/share/org/apache/tomcat/connector/HttpResponseBase.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- HttpResponseBase.java 2000/06/23 01:38:29 1.11
+++ HttpResponseBase.java 2000/07/06 18:51:33 1.12
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-tomcat/proposals/catalina/src/share/org/apache/tomcat/connector/HttpResponseBase.java,v 1.11 2000/06/23 01:38:29 craigmcc Exp $
- * $Revision: 1.11 $
- * $Date: 2000/06/23 01:38:29 $
+ * $Header: /home/cvs/jakarta-tomcat/proposals/catalina/src/share/org/apache/tomcat/connector/HttpResponseBase.java,v 1.12 2000/07/06 18:51:33 craigmcc Exp $
+ * $Revision: 1.12 $
+ * $Date: 2000/07/06 18:51:33 $
*
* ====================================================================
*
@@ -94,7 +94,7 @@
* methods need to be implemented.
*
* @author Craig R. McClanahan
- * @version $Revision: 1.11 $ $Date: 2000/06/23 01:38:29 $
+ * @version $Revision: 1.12 $ $Date: 2000/07/06 18:51:33 $
*/
public class HttpResponseBase
@@ -178,30 +178,39 @@
/**
- * Return an enumeration all the header names set for this response, or
- * an empty Enumeration if no headers have been set.
+ * Return an array of all the header names set for this response, or
+ * a zero-length array if no headers have been set.
*/
- public Enumeration getHeaderNames() {
+ public String[] getHeaderNames() {
- return (headers.keys());
+ Vector names = new Vector();
+ Enumeration keys = headers.keys();
+ while (keys.hasMoreElements())
+ names.addElement(keys.nextElement());
+ String results[] = new String[names.size()];
+ names.copyInto(results);
+ return (results);
}
/**
- * Return an enumeration of all the header values associated with the
- * specified header name, or an empty enumeration if there are no such
+ * Return an array of all the header values associated with the
+ * specified header name, or an zero-length array if there are no such
* header values.
*
* @param name Header name to look up
*/
- public Enumeration getHeaderValues(String name) {
+ public String[] getHeaderValues(String name) {
Vector values = (Vector) headers.get(name);
- if (values != null)
- return (values.elements());
- else
- return (null);
+ if (values == null)
+ return (new String[0]);
+ else {
+ String results[] = new String[values.size()];
+ values.copyInto(results);
+ return (results);
+ }
}