//
// ========================================================================
-// 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
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;
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))
else
{
if (_parameters==null)
- _parameters=new HashMap();
+ _parameters=new HashMap<String, String>();
_parameters.put(param,value);
}
}
/* ------------------------------------------------------------ */
protected void service(HttpServletRequest request, HttpServletResponse response)
- throws ServletException, IOException
+ throws ServletException, IOException
{
// Get the requested path and info
boolean included=false;
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
{
// 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))
{