updating jetty to jetty-9.2.16.v2016040

[gigi.git] / lib / jetty / org / eclipse / jetty / servlet / ServletContextHandler.java

diff --git a/lib/jetty/org/eclipse/jetty/servlet/ServletContextHandler.java b/lib/jetty/org/eclipse/jetty/servlet/ServletContextHandler.java
index d01ddd2a269f5368b60c53f2faafeedf9a7465c3..013ab5c87fb96adbe02dc00e79142d397cf35268 100644 (file)
--- 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
 //  ------------------------------------------------------------------------
 //  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.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;
 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());
                     }
                 }
                         decorator.decorate(holder.getListener());
                     }
                 }

-           }
-       }
-       
+            }
+        }
+        

         super.startContext();
 
         // OK to Initialize servlet handler now that all relevant object trees have been started
         super.startContext();
 
         // OK to Initialize servlet handler now that all relevant object trees have been started