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

fix merge error from master by setting new method on ServletHolder to Source.EMBEDDED

This commit is contained in:
Jesse McConnell 2012-01-26 11:18:35 -06:00
parent f2d0fd3cc8
commit 9c7b44d806
1 changed files with 2 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -85,17 +85,6 @@ public class ServletHolder extends Holder<Servlet> implements UserIdentity.Scope
{
super (Source.EMBEDDED);
}
/* ---------------------------------------------------------------- */
/** Constructor for existing servlet.
*/
public ServletHolder(String name,Servlet servlet)
{
setName(name);
setServlet(servlet);
}
/* ---------------------------------------------------------------- */
/** Constructor .
@ -117,8 +106,9 @@ public class ServletHolder extends Holder<Servlet> implements UserIdentity.Scope
/* ---------------------------------------------------------------- */
/** Constructor for servlet class.
*/
public ServletHolder(String name,Class<? extends Servlet> servlet)
public ServletHolder(String name, Class<? extends Servlet> servlet)
{
super (Source.EMBEDDED);
setName(name);
setHeldClass(servlet);
}