JETTY-1326 Invoker names not hashCode based
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3098 7e9141cc-0065-0410-87d8-b60c137991c4
This commit is contained in:
parent
d625f738ad
commit
6f8c330015
|
@ -13,6 +13,7 @@ jetty-7.4.1-SNAPSHOT
|
||||||
+ 344513 Attempting to set ConfigurationClasses in jetty-web.xml causes NPE
|
+ 344513 Attempting to set ConfigurationClasses in jetty-web.xml causes NPE
|
||||||
+ 344529 Ability to customize the error handling of the OSGi HttpService
|
+ 344529 Ability to customize the error handling of the OSGi HttpService
|
||||||
+ JETTY-954 WebAppContext eats any start exceptions instead of stopping the server load
|
+ JETTY-954 WebAppContext eats any start exceptions instead of stopping the server load
|
||||||
|
+ JETTY-1326 Invoker names not hashCode based
|
||||||
+ JETTY-1343 IllegalArgumentException for bad % encodings
|
+ JETTY-1343 IllegalArgumentException for bad % encodings
|
||||||
+ JETTY-1347 Updated ServletHander javadoc
|
+ JETTY-1347 Updated ServletHander javadoc
|
||||||
|
|
||||||
|
|
|
@ -82,14 +82,14 @@ public class ServletHandler extends ScopedHandler
|
||||||
/* ------------------------------------------------------------ */
|
/* ------------------------------------------------------------ */
|
||||||
private ServletContextHandler _contextHandler;
|
private ServletContextHandler _contextHandler;
|
||||||
private ContextHandler.Context _servletContext;
|
private ContextHandler.Context _servletContext;
|
||||||
private FilterHolder[] _filters;
|
private FilterHolder[] _filters=new FilterHolder[0];
|
||||||
private FilterMapping[] _filterMappings;
|
private FilterMapping[] _filterMappings;
|
||||||
private boolean _filterChainsCached=true;
|
private boolean _filterChainsCached=true;
|
||||||
private int _maxFilterChainsCacheSize=512;
|
private int _maxFilterChainsCacheSize=512;
|
||||||
private boolean _startWithUnavailable=true;
|
private boolean _startWithUnavailable=true;
|
||||||
private IdentityService _identityService;
|
private IdentityService _identityService;
|
||||||
|
|
||||||
private ServletHolder[] _servlets;
|
private ServletHolder[] _servlets=new ServletHolder[0];
|
||||||
private ServletMapping[] _servletMappings;
|
private ServletMapping[] _servletMappings;
|
||||||
|
|
||||||
private final Map<String,FilterHolder> _filterNameMap= new HashMap<String,FilterHolder>();
|
private final Map<String,FilterHolder> _filterNameMap= new HashMap<String,FilterHolder>();
|
||||||
|
@ -796,17 +796,15 @@ public class ServletHandler extends ScopedHandler
|
||||||
}
|
}
|
||||||
|
|
||||||
/* ------------------------------------------------------------ */
|
/* ------------------------------------------------------------ */
|
||||||
/** conveniance method to add a servlet.
|
/** Convenience method to add a servlet.
|
||||||
* @return The servlet holder.
|
* @return The servlet holder.
|
||||||
*/
|
*/
|
||||||
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+"-"+holder.hashCode());
|
holder.setName(className+"-"+LazyList.size(_servlets));
|
||||||
holder.setClassName(className);
|
holder.setClassName(className);
|
||||||
|
|
||||||
addServletWithMapping(holder,pathSpec);
|
addServletWithMapping(holder,pathSpec);
|
||||||
|
|
||||||
return holder;
|
return holder;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -921,7 +919,7 @@ public class ServletHandler extends ScopedHandler
|
||||||
public FilterHolder addFilterWithMapping (String className,String pathSpec,EnumSet<DispatcherType> dispatches)
|
public FilterHolder addFilterWithMapping (String className,String pathSpec,EnumSet<DispatcherType> dispatches)
|
||||||
{
|
{
|
||||||
FilterHolder holder = newFilterHolder();
|
FilterHolder holder = newFilterHolder();
|
||||||
holder.setName(className+"-"+holder.hashCode());
|
holder.setName(className+"-"+_filters.length);
|
||||||
holder.setClassName(className);
|
holder.setClassName(className);
|
||||||
|
|
||||||
addFilterWithMapping(holder,pathSpec,dispatches);
|
addFilterWithMapping(holder,pathSpec,dispatches);
|
||||||
|
@ -989,7 +987,7 @@ public class ServletHandler extends ScopedHandler
|
||||||
public FilterHolder addFilterWithMapping (String className,String pathSpec,int dispatches)
|
public FilterHolder addFilterWithMapping (String className,String pathSpec,int dispatches)
|
||||||
{
|
{
|
||||||
FilterHolder holder = newFilterHolder(null);
|
FilterHolder holder = newFilterHolder(null);
|
||||||
holder.setName(className+"-"+holder.hashCode());
|
holder.setName(className+"-"+_filters.length);
|
||||||
holder.setClassName(className);
|
holder.setClassName(className);
|
||||||
|
|
||||||
addFilterWithMapping(holder,pathSpec,dispatches);
|
addFilterWithMapping(holder,pathSpec,dispatches);
|
||||||
|
|
Loading…
Reference in New Issue