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

fixed merge

This commit is contained in:
Greg Wilkins 2014-12-31 16:28:35 +01:00
parent 2e3c223917
commit 200b3a3e64
3 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
jetty-server/src/main/java/org/eclipse/jetty/server/MultiPartCleanerListener.java
View File

@ -28,6 +28,12 @@ import org.eclipse.jetty.util.MultiPartInputStreamParser;
public class MultiPartCleanerListener implements ServletRequestListener public class MultiPartCleanerListener implements ServletRequestListener
{ {
public final static MultiPartCleanerListener INSTANCE = new MultiPartCleanerListener();
protected MultiPartCleanerListener()
{
}
@Override @Override
public void requestDestroyed(ServletRequestEvent sre) public void requestDestroyed(ServletRequestEvent sre)
{ {

2
jetty-server/src/test/java/org/eclipse/jetty/server/RequestTest.java
View File

@ -292,7 +292,7 @@ public class RequestTest
contextHandler.setContextPath("/foo"); contextHandler.setContextPath("/foo");
contextHandler.setResourceBase("."); contextHandler.setResourceBase(".");
contextHandler.setHandler(new BadMultiPartRequestHandler(testTmpDir)); contextHandler.setHandler(new BadMultiPartRequestHandler(testTmpDir));
contextHandler.addEventListener(new Request.MultiPartCleanerListener() contextHandler.addEventListener(new MultiPartCleanerListener()
{ {
@Override @Override

2
jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletHolder.java
View File

@ -696,7 +696,7 @@ public class ServletHolder extends Holder<Servlet> implements UserIdentity.Scope
//servlet calling Request.getPart() or Request.getParts() //servlet calling Request.getPart() or Request.getParts()
ContextHandler ch = ContextHandler.getContextHandler(getServletHandler().getServletContext()); ContextHandler ch = ContextHandler.getContextHandler(getServletHandler().getServletContext());
ch.addEventListener(new MultiPartCleanerListener()); ch.addEventListener(MultiPartCleanerListener.INSTANCE);
} }
} }