Author: markt
Date: Tue Nov 17 02:41:55 2009
New Revision: 881109
URL: http://svn.apache.org/viewvc?rev=881109&view=rev
Log:
Update throws declaration for Servlet 3 file upload
Do the easy part of the implementation
Modified:
tomcat/trunk/java/javax/servlet/http/HttpServletRequest.java
tomcat/trunk/java/javax/servlet/http/HttpServletRequestWrapper.java
tomcat/trunk/java/org/apache/catalina/connector/Request.java
tomcat/trunk/java/org/apache/catalina/connector/RequestFacade.java
Modified: tomcat/trunk/java/javax/servlet/http/HttpServletRequest.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/http/HttpServletRequest.java?rev=881109&r1=881108&r2=881109&view=diff
==============================================================================
--- tomcat/trunk/java/javax/servlet/http/HttpServletRequest.java (original)
+++ tomcat/trunk/java/javax/servlet/http/HttpServletRequest.java Tue Nov 17
02:41:55 2009
@@ -697,21 +697,27 @@
/**
- *
+ * Return a collection of all uploaded Parts.
* @return
+ * @throws IOException if an I/O error occurs
+ * @throws IllegalStateException if size limits are exceeded
+ * @throws ServletException if the request is not multipart/form-data
* @since Servlet 3.0
- * TODO SERVLET3 - Add comments
*/
- public Collection<Part> getParts() throws IOException, ServletException;
+ public Collection<Part> getParts() throws IOException,
+ IllegalStateException, ServletException;
/**
- *
+ * Gets the named Part or null if the Part does not exist. Triggers upload
+ * of all Parts.
* @param name
* @return
- * @throws IllegalArgumentException
+ * @throws IOException if an I/O error occurs
+ * @throws IllegalStateException if size limits are exceeded
+ * @throws ServletException if the request is not multipart/form-data
* @since Servlet 3.0
- * TODO SERVLET3 - Add comments
*/
- public Part getPart(String name);
+ public Part getPart(String name) throws IOException, IllegalStateException,
+ ServletException;
}
Modified: tomcat/trunk/java/javax/servlet/http/HttpServletRequestWrapper.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/http/HttpServletRequestWrapper.java?rev=881109&r1=881108&r2=881109&view=diff
==============================================================================
--- tomcat/trunk/java/javax/servlet/http/HttpServletRequestWrapper.java
(original)
+++ tomcat/trunk/java/javax/servlet/http/HttpServletRequestWrapper.java Tue Nov
17 02:41:55 2009
@@ -294,15 +294,20 @@
* @since Servlet 3.0
* TODO SERVLET3 - Add comments
*/
- public Collection<Part> getParts() throws IOException, ServletException {
+ public Collection<Part> getParts() throws IllegalStateException,
+ IOException, ServletException {
return this._getHttpServletRequest().getParts();
}
/**
+ * @throws ServletException
+ * @throws IOException
+ * @throws IllegalStateException
* @since Servlet 3.0
* TODO SERVLET3 - Add comments
*/
- public Part getPart(String name) {
+ public Part getPart(String name) throws IllegalStateException, IOException,
+ ServletException {
return this._getHttpServletRequest().getPart(name);
}
Modified: tomcat/trunk/java/org/apache/catalina/connector/Request.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/Request.java?rev=881109&r1=881108&r2=881109&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/connector/Request.java (original)
+++ tomcat/trunk/java/org/apache/catalina/connector/Request.java Tue Nov 17
02:41:55 2009
@@ -2380,13 +2380,22 @@
null, null, null);
}
- public Collection<Part> getParts() {
+ public Collection<Part> getParts() throws IOException,
IllegalStateException,
+ ServletException {
// TODO SERVLET3 - file upload
return null;
}
- public Part getPart(String name) throws IllegalArgumentException {
- // TODO SERVLET3 - file upload
+ public Part getPart(String name) throws IOException, IllegalStateException,
+ ServletException {
+ Collection<Part> parts = getParts();
+ Iterator<Part> iterator = parts.iterator();
+ while (iterator.hasNext()) {
+ Part part = iterator.next();
+ if (name.equals(part.getName())) {
+ return part;
+ }
+ }
return null;
}
Modified: tomcat/trunk/java/org/apache/catalina/connector/RequestFacade.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/RequestFacade.java?rev=881109&r1=881108&r2=881109&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/connector/RequestFacade.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/connector/RequestFacade.java Tue Nov
17 02:41:55 2009
@@ -996,11 +996,13 @@
request.logout();
}
- public Collection<Part> getParts() {
+ public Collection<Part> getParts() throws IllegalStateException,
+ IOException, ServletException {
return request.getParts();
}
- public Part getPart(String name) {
+ public Part getPart(String name) throws IllegalStateException, IOException,
+ ServletException {
return request.getPart(name);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
