X-Git-Url: https://code.wpia.club/?a=blobdiff_plain;f=lib%2Fjetty%2Forg%2Feclipse%2Fjetty%2Fservlet%2FServletContextHandler.java;h=013ab5c87fb96adbe02dc00e79142d397cf35268;hb=065ca60170f2471227dc25784e1a4c3b7912d367;hp=d01ddd2a269f5368b60c53f2faafeedf9a7465c3;hpb=73ef54a38e3930a1a789cdc6b5fa23cdd4c9d086;p=gigi.git diff --git a/lib/jetty/org/eclipse/jetty/servlet/ServletContextHandler.java b/lib/jetty/org/eclipse/jetty/servlet/ServletContextHandler.java index d01ddd2a..013ab5c8 100644 --- a/lib/jetty/org/eclipse/jetty/servlet/ServletContextHandler.java +++ b/lib/jetty/org/eclipse/jetty/servlet/ServletContextHandler.java @@ -1,6 +1,6 @@ // // ======================================================================== -// Copyright (c) 1995-2014 Mort Bay Consulting Pty. Ltd. +// Copyright (c) 1995-2016 Mort Bay Consulting Pty. Ltd. // ------------------------------------------------------------------------ // All rights reserved. This program and the accompanying materials // are made available under the terms of the Eclipse Public License v1.0 @@ -35,8 +35,6 @@ import javax.servlet.Filter; import javax.servlet.FilterRegistration; import javax.servlet.RequestDispatcher; import javax.servlet.Servlet; -import javax.servlet.ServletContainerInitializer; -import javax.servlet.ServletContext; import javax.servlet.ServletContextEvent; import javax.servlet.ServletContextListener; import javax.servlet.ServletException; @@ -290,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