diff options
Diffstat (limited to 'jetty-servlet/src/main/java/org/eclipse')
5 files changed, 37 insertions, 37 deletions
diff --git a/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/FilterMapping.java b/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/FilterMapping.java index 05eec85a86..d8265842f9 100644 --- a/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/FilterMapping.java +++ b/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/FilterMapping.java @@ -66,19 +66,19 @@ public class FilterMapping implements Dumpable */ public static int dispatch(DispatcherType type) { - switch(type) - { - case REQUEST: - return REQUEST; - case ASYNC: - return ASYNC; - case FORWARD: - return FORWARD; - case INCLUDE: - return INCLUDE; - case ERROR: - return ERROR; - } + switch(type) + { + case REQUEST: + return REQUEST; + case ASYNC: + return ASYNC; + case FORWARD: + return FORWARD; + case INCLUDE: + return INCLUDE; + case ERROR: + return ERROR; + } throw new IllegalArgumentException(type.toString()); } @@ -123,8 +123,8 @@ public class FilterMapping implements Dumpable */ boolean appliesTo(int type) { - if (_dispatches==0) - return type==REQUEST || type==ASYNC && _holder.isAsyncSupported(); + if (_dispatches==0) + return type==REQUEST || type==ASYNC && _holder.isAsyncSupported(); return (_dispatches&type)!=0; } diff --git a/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/Invoker.java b/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/Invoker.java index 62bd87ccef..b7f0e748f7 100644 --- a/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/Invoker.java +++ b/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/Invoker.java @@ -112,7 +112,7 @@ public class Invoker extends HttpServlet /* ------------------------------------------------------------ */ protected void service(HttpServletRequest request, HttpServletResponse response) - throws ServletException, IOException + throws ServletException, IOException { // Get the requested path and info boolean included=false; diff --git a/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletContextHandler.java b/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletContextHandler.java index e080e55ec6..7e2e22e6fc 100644 --- a/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletContextHandler.java +++ b/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletContextHandler.java @@ -288,9 +288,9 @@ public class ServletContextHandler extends ContextHandler decorator.decorate(holder.getListener()); } } - } - } - + } + } + super.startContext(); // OK to Initialize servlet handler now that all relevant object trees have been started diff --git a/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletHandler.java b/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletHandler.java index 371ed3021b..e650a709fc 100644 --- a/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletHandler.java +++ b/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletHandler.java @@ -751,23 +751,23 @@ public class ServletHandler extends ScopedHandler final Map<String,FilterChain> cache=_chainCache[dispatch]; final Queue<String> lru=_chainLRU[dispatch]; - // Do we have too many cached chains? - while (_maxFilterChainsCacheSize>0 && cache.size()>=_maxFilterChainsCacheSize) - { - // The LRU list is not atomic with the cache map, so be prepared to invalidate if - // a key is not found to delete. - // Delete by LRU (where U==created) - String k=lru.poll(); - if (k==null) - { - cache.clear(); - break; - } - cache.remove(k); - } - - cache.put(key,chain); - lru.add(key); + // Do we have too many cached chains? + while (_maxFilterChainsCacheSize>0 && cache.size()>=_maxFilterChainsCacheSize) + { + // The LRU list is not atomic with the cache map, so be prepared to invalidate if + // a key is not found to delete. + // Delete by LRU (where U==created) + String k=lru.poll(); + if (k==null) + { + cache.clear(); + break; + } + cache.remove(k); + } + + cache.put(key,chain); + lru.add(key); } else if (filters.size() > 0) chain = new Chain(baseRequest,filters, servletHolder); diff --git a/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletHolder.java b/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletHolder.java index 32a6d3de6c..ee57e2ab7d 100644 --- a/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletHolder.java +++ b/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletHolder.java @@ -569,7 +569,7 @@ public class ServletHolder extends Holder<Servlet> implements UserIdentity.Scope /* ------------------------------------------------------------ */ private void initServlet() - throws ServletException + throws ServletException { Object old_run_as = null; try |