geronimo-scm mailing list archives

Author: djencks
Date: Tue Jan  5 18:46:13 2010
New Revision: 896175

URL: http://svn.apache.org/viewvc?rev=896175&view=rev
Log:
Fix an api problem pointed out by Max Moldenhauerr

Modified:
    geronimo/specs/trunk/geronimo-servlet_3.0_spec/src/main/java/javax/servlet/http/HttpServletResponse.java
    geronimo/specs/trunk/geronimo-servlet_3.0_spec/src/main/java/javax/servlet/http/HttpServletResponseWrapper.java

Modified: geronimo/specs/trunk/geronimo-servlet_3.0_spec/src/main/java/javax/servlet/http/HttpServletResponse.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-servlet_3.0_spec/src/main/java/javax/servlet/http/HttpServletResponse.java?rev=896175&r1=896174&r2=896175&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-servlet_3.0_spec/src/main/java/javax/servlet/http/HttpServletResponse.java
(original)
+++ geronimo/specs/trunk/geronimo-servlet_3.0_spec/src/main/java/javax/servlet/http/HttpServletResponse.java
Tue Jan  5 18:46:13 2010
@@ -20,6 +20,7 @@
 package javax.servlet.http;
 
 import java.io.IOException;
+import java.util.Collection;
 
 import javax.servlet.ServletResponse;
 
@@ -478,13 +479,14 @@
      * @return all the header names
      * @since 3.0
      */
-    Iterable<String> getHeaderNames();
+    Collection<String> getHeaderNames();
 
     /**
+     * @param headerName header name for which headers are requested
      * @return all the header values
      * @since 3.0
      */
-    Iterable<String> getHeaders(String headerName);
+    Collection<String> getHeaders(String headerName);
 
     /**
      * @return current http status

Modified: geronimo/specs/trunk/geronimo-servlet_3.0_spec/src/main/java/javax/servlet/http/HttpServletResponseWrapper.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-servlet_3.0_spec/src/main/java/javax/servlet/http/HttpServletResponseWrapper.java?rev=896175&r1=896174&r2=896175&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-servlet_3.0_spec/src/main/java/javax/servlet/http/HttpServletResponseWrapper.java
(original)
+++ geronimo/specs/trunk/geronimo-servlet_3.0_spec/src/main/java/javax/servlet/http/HttpServletResponseWrapper.java
Tue Jan  5 18:46:13 2010
@@ -20,6 +20,7 @@
 package javax.servlet.http;
 
 import java.io.IOException;
+import java.util.Collection;
 
 import javax.servlet.ServletResponseWrapper;
 
@@ -40,6 +41,7 @@
     /**
      * Constructs a response adaptor wrapping the given response.
      *
+     * @param response response to wrap
      * @throws java.lang.IllegalArgumentException
      *          if the response is null
      */
@@ -105,11 +107,11 @@
         return getHttpServletResponse().getHeader(name);
     }
 
-    public Iterable<String> getHeaderNames() {
+    public Collection<String> getHeaderNames() {
         return getHttpServletResponse().getHeaderNames();
     }
 
-    public Iterable<String> getHeaders(String headerName) {
+    public Collection<String> getHeaders(String headerName) {
         return getHttpServletResponse().getHeaders(headerName);
     }