updating jetty to jetty-9.2.16.v2016040

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

diff --git a/lib/jetty/org/eclipse/jetty/servlet/Invoker.java b/lib/jetty/org/eclipse/jetty/servlet/Invoker.java
index 4613144bafd48f4df20b6236e02583e5777df0cc..52d9bea6a7575d508becce9368e73df708714170 100644 (file)
--- a/lib/jetty/org/eclipse/jetty/servlet/Invoker.java
+++ b/lib/jetty/org/eclipse/jetty/servlet/Invoker.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
@@ -72,8 +72,8 @@ public class Invoker extends HttpServlet
 
     private ContextHandler _contextHandler;
     private ServletHandler _servletHandler;
-    private Map.Entry _invokerEntry;
-    private Map _parameters;
+    private Map.Entry<String, ServletHolder> _invokerEntry;
+    private Map<String, String> _parameters;
     private boolean _nonContextServlets;
     private boolean _verbose;
 
@@ -87,10 +87,10 @@ public class Invoker extends HttpServlet
         while (handler!=null && !(handler instanceof ServletHandler) && (handler instanceof HandlerWrapper))
             handler=((HandlerWrapper)handler).getHandler();
         _servletHandler = (ServletHandler)handler;
-        Enumeration e = getInitParameterNames();
+        Enumeration<String> e = getInitParameterNames();
         while(e.hasMoreElements())
         {
-            String param=(String)e.nextElement();
+            String param=e.nextElement();
             String value=getInitParameter(param);
             String lvalue=value.toLowerCase(Locale.ENGLISH);
             if ("nonContextServlets".equals(param))
@@ -104,7 +104,7 @@ public class Invoker extends HttpServlet
             else
             {
                 if (_parameters==null)
-                    _parameters=new HashMap();
+                    _parameters=new HashMap<String, String>();
                 _parameters.put(param,value);
             }
         }
@@ -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;
@@ -151,7 +151,7 @@ public class Invoker extends HttpServlet
             ServletMapping mapping = new ServletMapping();
             mapping.setServletName(servlet);
             mapping.setPathSpec(URIUtil.addPaths(servlet_path,servlet)+"/*");
-            _servletHandler.setServletMappings((ServletMapping[])ArrayUtil.addToArray(_servletHandler.getServletMappings(), mapping, ServletMapping.class));
+            _servletHandler.setServletMappings(ArrayUtil.addToArray(_servletHandler.getServletMappings(), mapping, ServletMapping.class));
         }
         else
         {
@@ -171,7 +171,7 @@ public class Invoker extends HttpServlet
 
                 // Check for existing mapping (avoid threaded race).
                 String path=URIUtil.addPaths(servlet_path,servlet);
-                Map.Entry entry = _servletHandler.getHolderEntry(path);
+                Map.Entry<String, ServletHolder> entry = _servletHandler.getHolderEntry(path);
 
                 if (entry!=null && !entry.equals(_invokerEntry))
                 {