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

more surgical excision of LazyList

This commit is contained in:
Joakim Erdfelt 2012-08-10 06:37:50 -07:00
parent b147b68c8e
commit 95b70cac81
1 changed files with 25 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -566,15 +566,16 @@ public class ServletHandler extends ScopedHandler
return chain; return chain;
} }
// Build list of filters // Build list of filters (list of FilterHolder objects)
Object filters= null; List<FilterHolder> filters = new ArrayList<>();
// Path filters // Path filters
if (pathInContext!=null && _filterPathMappings!=null) if (pathInContext!=null && _filterPathMappings!=null)
{ {
for (FilterMapping filterPathMapping : _filterPathMappings) for (FilterMapping filterPathMapping : _filterPathMappings)
{ {
if (filterPathMapping.appliesTo(pathInContext, dispatch)) if (filterPathMapping.appliesTo(pathInContext, dispatch))
filters = LazyList.add(filters, filterPathMapping.getFilterHolder()); filters.add(filterPathMapping.getFilterHolder());
} }
} }
@ -585,11 +586,12 @@ public class ServletHandler extends ScopedHandler
if (_filterNameMappings.size() > 0) if (_filterNameMappings.size() > 0)
{ {
Object o= _filterNameMappings.get(servletHolder.getName()); Object o= _filterNameMappings.get(servletHolder.getName());
for (int i=0; i<LazyList.size(o);i++) for (int i=0; i<LazyList.size(o);i++)
{ {
FilterMapping mapping = (FilterMapping)LazyList.get(o,i); FilterMapping mapping = (FilterMapping)LazyList.get(o,i);
if (mapping.appliesTo(dispatch)) if (mapping.appliesTo(dispatch))
filters=LazyList.add(filters,mapping.getFilterHolder()); filters.add(mapping.getFilterHolder());
} }
o= _filterNameMappings.get("*"); o= _filterNameMappings.get("*");
@ -597,19 +599,19 @@ public class ServletHandler extends ScopedHandler
{ {
FilterMapping mapping = (FilterMapping)LazyList.get(o,i); FilterMapping mapping = (FilterMapping)LazyList.get(o,i);
if (mapping.appliesTo(dispatch)) if (mapping.appliesTo(dispatch))
filters=LazyList.add(filters,mapping.getFilterHolder()); filters.add(mapping.getFilterHolder());
} }
} }
} }
if (filters==null) if (filters.isEmpty())
return null; return null;
FilterChain chain = null; FilterChain chain = null;
if (_filterChainsCached) if (_filterChainsCached)
{ {
if (LazyList.size(filters) > 0) if (filters.size() > 0)
chain= new CachedChain(filters, servletHolder); chain= new CachedChain(filters, servletHolder);
final Map<String,FilterChain> cache=_chainCache[dispatch]; final Map<String,FilterChain> cache=_chainCache[dispatch];
@ -633,7 +635,7 @@ public class ServletHandler extends ScopedHandler
cache.put(key,chain); cache.put(key,chain);
lru.add(key); lru.add(key);
} }
else if (LazyList.size(filters) > 0) else if (filters.size() > 0)
chain = new Chain(baseRequest,filters, servletHolder); chain = new Chain(baseRequest,filters, servletHolder);
return chain; return chain;
@ -775,7 +777,7 @@ public class ServletHandler extends ScopedHandler
public ServletHolder addServletWithMapping (String className,String pathSpec) public ServletHolder addServletWithMapping (String className,String pathSpec)
{ {
ServletHolder holder = newServletHolder(null); ServletHolder holder = newServletHolder(null);
holder.setName(className+"-"+LazyList.size(_servlets)); holder.setName(className+"-"+_servlets.length);
holder.setClassName(className); holder.setClassName(className);
addServletWithMapping(holder,pathSpec); addServletWithMapping(holder,pathSpec);
return holder; return holder;
@ -1261,12 +1263,16 @@ public class ServletHandler extends ScopedHandler
ServletHolder _servletHolder; ServletHolder _servletHolder;
/* ------------------------------------------------------------ */ /* ------------------------------------------------------------ */
CachedChain(Object filters, ServletHolder servletHolder) /**
* @param filters list of {@link FilterHolder} objects
* @param servletHolder
*/
CachedChain(List<FilterHolder> filters, ServletHolder servletHolder)
{ {
if (LazyList.size(filters)>0) if (filters.size()>0)
{ {
_filterHolder=(FilterHolder)LazyList.get(filters, 0); _filterHolder=filters.get(0);
filters=LazyList.remove(filters,0); filters.remove(0);
_next=new CachedChain(filters,servletHolder); _next=new CachedChain(filters,servletHolder);
} }
else else
@ -1340,12 +1346,12 @@ public class ServletHandler extends ScopedHandler
private class Chain implements FilterChain private class Chain implements FilterChain
{ {
final Request _baseRequest; final Request _baseRequest;
final Object _chain; final List<FilterHolder> _chain;
final ServletHolder _servletHolder; final ServletHolder _servletHolder;
int _filter= 0; int _filter= 0;
/* ------------------------------------------------------------ */ /* ------------------------------------------------------------ */
Chain(Request baseRequest, Object filters, ServletHolder servletHolder) Chain(Request baseRequest, List<FilterHolder> filters, ServletHolder servletHolder)
{ {
_baseRequest=baseRequest; _baseRequest=baseRequest;
_chain= filters; _chain= filters;
@ -1360,9 +1366,9 @@ public class ServletHandler extends ScopedHandler
LOG.debug("doFilter " + _filter); LOG.debug("doFilter " + _filter);
// pass to next filter // pass to next filter
if (_filter < LazyList.size(_chain)) if (_filter < _chain.size())
{ {
FilterHolder holder= (FilterHolder)LazyList.get(_chain, _filter++); FilterHolder holder= _chain.get(_filter++);
if (LOG.isDebugEnabled()) if (LOG.isDebugEnabled())
LOG.debug("call filter " + holder); LOG.debug("call filter " + holder);
Filter filter= holder.getFilter(); Filter filter= holder.getFilter();
@ -1409,10 +1415,9 @@ public class ServletHandler extends ScopedHandler
public String toString() public String toString()
{ {
StringBuilder b = new StringBuilder(); StringBuilder b = new StringBuilder();
for (int i=0; i<LazyList.size(_chain);i++) for(FilterHolder f: _chain)
{ {
Object o=LazyList.get(_chain, i); b.append(f.toString());
b.append(o.toString());
b.append("->"); b.append("->");
} }
b.append(_servletHolder); b.append(_servletHolder);