Eclipse/jetty.project
1
0
Fork 0
mirror of https://github.com/jetty/jetty.project.git synced 2025-03-01 11:29:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x

Browse Source
This commit is contained in:
Jan Bartel 2016-11-03 10:56:35 +11:00
commit dfdd324bc8
2 changed files with 197 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

74
jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletHandler.java
View File

@ -885,7 +885,11 @@ public class ServletHandler extends ScopedHandler
try
{
setServlets(ArrayUtil.addToArray(holders, servlet, ServletHolder.class));
synchronized (this)
{
if (servlet != null && !containsServletHolder(servlet))
setServlets(ArrayUtil.addToArray(holders, servlet, ServletHolder.class));
}
ServletMapping mapping = new ServletMapping();
mapping.setServletName(servlet.getName());
@ -907,7 +911,14 @@ public class ServletHandler extends ScopedHandler
*/
public void addServlet(ServletHolder holder)
{
setServlets(ArrayUtil.addToArray(getServlets(), holder, ServletHolder.class));
if (holder == null)
return;
synchronized (this)
{
if (!containsServletHolder(holder))
setServlets(ArrayUtil.addToArray(getServlets(), holder, ServletHolder.class));
}
}
/* ------------------------------------------------------------ */
@ -989,7 +1000,11 @@ public class ServletHandler extends ScopedHandler
try
{
setFilters(ArrayUtil.addToArray(holders, holder, FilterHolder.class));
synchronized (this)
{
if (holder != null && !containsFilterHolder(holder))
setFilters(ArrayUtil.addToArray(holders, holder, FilterHolder.class));
}
FilterMapping mapping = new FilterMapping();
mapping.setFilterName(holder.getName());
@ -1051,7 +1066,11 @@ public class ServletHandler extends ScopedHandler
try
{
setFilters(ArrayUtil.addToArray(holders, holder, FilterHolder.class));
synchronized (this)
{
if (holder != null && !containsFilterHolder(holder))
setFilters(ArrayUtil.addToArray(holders, holder, FilterHolder.class));
}
FilterMapping mapping = new FilterMapping();
mapping.setFilterName(holder.getName());
@ -1092,7 +1111,13 @@ public class ServletHandler extends ScopedHandler
public void addFilter (FilterHolder filter, FilterMapping filterMapping)
{
if (filter != null)
setFilters(ArrayUtil.addToArray(getFilters(), filter, FilterHolder.class));
{
synchronized (this)
{
if (!containsFilterHolder(filter))
setFilters(ArrayUtil.addToArray(getFilters(), filter, FilterHolder.class));
}
}
if (filterMapping != null)
addFilterMapping(filterMapping);
}
@ -1105,8 +1130,14 @@ public class ServletHandler extends ScopedHandler
*/
public void addFilter (FilterHolder filter)
{
if (filter != null)
setFilters(ArrayUtil.addToArray(getFilters(), filter, FilterHolder.class));
if (filter == null)
return;
synchronized (this)
{
if (!containsFilterHolder(filter))
setFilters(ArrayUtil.addToArray(getFilters(), filter, FilterHolder.class));
}
}
/* ------------------------------------------------------------ */
@ -1449,7 +1480,36 @@ public class ServletHandler extends ScopedHandler
if (getHandler()!=null)
nextHandle(URIUtil.addPaths(request.getServletPath(),request.getPathInfo()),baseRequest,request,response);
}
protected synchronized boolean containsFilterHolder (FilterHolder holder)
{
if (_filters == null)
return false;
boolean found = false;
for (FilterHolder f:_filters)
{
if (f == holder)
found = true;
}
return found;
}
protected synchronized boolean containsServletHolder (ServletHolder holder)
{
if (_servlets == null)
return false;
boolean found = false;
for (ServletHolder s:_servlets)
{
if (s == holder)
found = true;
}
return found;
}
/* ------------------------------------------------------------ */
/**
* @param filterChainsCached The filterChainsCached to set.

130
jetty-servlet/src/test/java/org/eclipse/jetty/servlet/ServletHandlerTest.java
View File

@ -99,6 +99,136 @@ public class ServletHandlerTest
}
@Test
public void testAddFilterIgnoresDuplicates() throws Exception
{
ServletHandler handler = new ServletHandler();
FilterHolder h = new FilterHolder();
h.setName("x");
handler.addFilter(h);
FilterHolder[] holders = handler.getFilters();
assertNotNull(holders);
assertTrue(holders[0]==h);
handler.addFilter(h);
holders = handler.getFilters();
assertNotNull(holders);
assertTrue(holders.length == 1);
assertTrue(holders[0] == h);
FilterHolder h2 = new FilterHolder();
h2.setName("x"); //not allowed by servlet spec, just here to test object equality
handler.addFilter(h2);
holders = handler.getFilters();
assertNotNull(holders);
assertTrue(holders.length == 2);
assertTrue(holders[1] == h2);
}
@Test
public void testAddFilterIgnoresDuplicates2() throws Exception
{
ServletHandler handler = new ServletHandler();
FilterHolder h = new FilterHolder();
h.setName("x");
FilterMapping m = new FilterMapping();
m.setPathSpec("/*");
m.setFilterHolder(h);
handler.addFilter(h,m);
FilterHolder[] holders = handler.getFilters();
assertNotNull(holders);
assertTrue(holders[0]==h);
FilterMapping m2 = new FilterMapping();
m2.setPathSpec("/*");
m2.setFilterHolder(h);
handler.addFilter(h, m2);
holders = handler.getFilters();
assertNotNull(holders);
assertTrue(holders.length == 1);
assertTrue(holders[0] == h);
FilterHolder h2 = new FilterHolder();
h2.setName("x"); //not allowed by servlet spec, just here to test object equality
FilterMapping m3 = new FilterMapping();
m3.setPathSpec("/*");
m3.setFilterHolder(h);
handler.addFilter(h2, m3);
holders = handler.getFilters();
assertNotNull(holders);
assertTrue(holders.length == 2);
assertTrue(holders[1] == h2);
}
@Test
public void testAddFilterWithMappingIgnoresDuplicateFilters() throws Exception
{
ServletHandler handler = new ServletHandler();
FilterHolder h = new FilterHolder();
h.setName("x");
handler.addFilterWithMapping(h,"/*", 0);
FilterHolder[] holders = handler.getFilters();
assertNotNull(holders);
assertTrue(holders[0]==h);
handler.addFilterWithMapping(h, "/*", 1);
holders = handler.getFilters();
assertNotNull(holders);
assertTrue(holders.length == 1);
assertTrue(holders[0] == h);
FilterHolder h2 = new FilterHolder();
h2.setName("x"); //not allowed by servlet spec, just here to test object equality
handler.addFilterWithMapping(h2, "/*", 0);
holders = handler.getFilters();
assertNotNull(holders);
assertTrue(holders.length == 2);
assertTrue(holders[1] == h2);
}
@Test
public void testAddFilterWithMappingIngoresDuplicateFilters2 () throws Exception
{
ServletHandler handler = new ServletHandler();
FilterHolder h = new FilterHolder();
h.setName("x");
handler.addFilterWithMapping(h,"/*", EnumSet.allOf(DispatcherType.class));
FilterHolder[] holders = handler.getFilters();
assertNotNull(holders);
assertTrue(holders[0]==h);
handler.addFilterWithMapping(h, "/x", EnumSet.allOf(DispatcherType.class));
holders = handler.getFilters();
assertNotNull(holders);
assertTrue(holders.length == 1);
assertTrue(holders[0] == h);
FilterHolder h2 = new FilterHolder();
h2.setName("x"); //not allowed by servlet spec, just here to test object equality
handler.addFilterWithMapping(h2, "/*", EnumSet.allOf(DispatcherType.class));
holders = handler.getFilters();
assertNotNull(holders);
assertTrue(holders.length == 2);
assertTrue(holders[1] == h2);
}
@Test
public void testDuplicateMappingsForbidden() throws Exception
{