Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

377323 Request#getParts() throws ServletException when it should be throwing IllegalStateException

This commit is contained in:
Jan Bartel 2012-04-24 17:25:08 +10:00
parent 8c61e36b45
commit 7da85a2719
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
jetty-server/src/main/java/org/eclipse/jetty/server/Request.java
View File

@ -1943,7 +1943,7 @@ public class Request implements HttpServletRequest
public Part getPart(String name) throws IOException, ServletException
{
if (getContentType() == null || !getContentType().startsWith("multipart/form-data"))
return null;
throw new ServletException("Content-Type != multipart/form-data");
if (_multiPartInputStream == null)
{
@ -1974,7 +1974,7 @@ public class Request implements HttpServletRequest
public Collection<Part> getParts() throws IOException, ServletException
{
if (getContentType() == null || !getContentType().startsWith("multipart/form-data"))
return Collections.emptyList();
throw new ServletException("Content-Type != multipart/form-data");
if (_multiPartInputStream == null)
{

14
jetty-util/src/main/java/org/eclipse/jetty/util/MultiPartInputStream.java
View File

@ -83,7 +83,7 @@ public class MultiPartInputStream
protected void open()
throws FileNotFoundException, IOException
throws IOException
{
//We will either be writing to a file, if it has a filename on the content-disposition
//and otherwise a byte-array-input-stream, OR if we exceed the getFileSizeThreshold, we
@ -108,10 +108,10 @@ public class MultiPartInputStream
protected void write (int b)
throws IOException, ServletException
throws IOException
{
if (MultiPartInputStream.this._config.getMaxFileSize() > 0 && _size + 1 > MultiPartInputStream.this._config.getMaxFileSize())
throw new ServletException ("Multipart Mime part "+_name+" exceeds max filesize");
throw new IllegalStateException ("Multipart Mime part "+_name+" exceeds max filesize");
if (MultiPartInputStream.this._config.getFileSizeThreshold() > 0 && _size + 1 > MultiPartInputStream.this._config.getFileSizeThreshold() && _file==null)
createFile();
@ -120,10 +120,10 @@ public class MultiPartInputStream
}
protected void write (byte[] bytes, int offset, int length)
throws IOException, ServletException
throws IOException
{
if (MultiPartInputStream.this._config.getMaxFileSize() > 0 && _size + length > MultiPartInputStream.this._config.getMaxFileSize())
throw new ServletException ("Multipart Mime part "+_name+" exceeds max filesize");
throw new IllegalStateException ("Multipart Mime part "+_name+" exceeds max filesize");
if (MultiPartInputStream.this._config.getFileSizeThreshold() > 0 && _size + length > MultiPartInputStream.this._config.getFileSizeThreshold() && _file==null)
createFile();
@ -402,7 +402,7 @@ public class MultiPartInputStream
total += bytes.length;
if (_config.getMaxRequestSize() > 0 && total > _config.getMaxRequestSize())
throw new ServletException ("Request exceeds maxRequestSize ("+_config.getMaxRequestSize()+")");
throw new IllegalStateException ("Request exceeds maxRequestSize ("+_config.getMaxRequestSize()+")");
line=new String(bytes,"UTF-8");
@ -513,7 +513,7 @@ public class MultiPartInputStream
{
total ++;
if (_config.getMaxRequestSize() > 0 && total > _config.getMaxRequestSize())
throw new ServletException("Request exceeds maxRequestSize ("+_config.getMaxRequestSize()+")");
throw new IllegalStateException("Request exceeds maxRequestSize ("+_config.getMaxRequestSize()+")");
state=-2;
// look for CR and/or LF

4
jetty-util/src/test/java/org/eclipse/jetty/util/MultiPartInputStreamTest.java
View File

@ -85,7 +85,7 @@ public class MultiPartInputStreamTest extends TestCase
mpis.getParts();
fail("Request should have exceeded maxRequestSize");
}
catch (ServletException e)
catch (IllegalStateException e)
{
assertTrue(e.getMessage().startsWith("Request exceeds maxRequestSize"));
}
@ -105,7 +105,7 @@ public class MultiPartInputStreamTest extends TestCase
mpis.getParts();
fail("stuff.txt should have been larger than maxFileSize");
}
catch (ServletException e)
catch (IllegalStateException e)
{
assertTrue(e.getMessage().startsWith("Multipart Mime part"));
}