Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 090D3200D11 for ; Mon, 2 Oct 2017 21:21:30 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 076201609EF; Mon, 2 Oct 2017 19:21:30 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 4B6091609C0 for ; Mon, 2 Oct 2017 21:21:28 +0200 (CEST) Received: (qmail 89834 invoked by uid 500); 2 Oct 2017 19:21:24 -0000 Mailing-List: contact dev-help@tomcat.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: "Tomcat Developers List" Delivered-To: mailing list dev@tomcat.apache.org Received: (qmail 89634 invoked by uid 99); 2 Oct 2017 19:21:24 -0000 Received: from Unknown (HELO svn01-us-west.apache.org) (209.188.14.144) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 02 Oct 2017 19:21:24 +0000 Received: from svn01-us-west.apache.org (localhost [127.0.0.1]) by svn01-us-west.apache.org (ASF Mail Server at svn01-us-west.apache.org) with ESMTP id 652023A0287 for ; Mon, 2 Oct 2017 19:21:22 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1810580 [2/3] - in /tomcat/tc7.0.x/trunk: ./ java/javax/el/ java/javax/websocket/ java/javax/websocket/server/ java/org/apache/catalina/connector/ java/org/apache/catalina/core/ java/org/apache/tomcat/ Date: Mon, 02 Oct 2017 19:21:19 -0000 To: dev@tomcat.apache.org From: markt@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20171002192122.652023A0287@svn01-us-west.apache.org> archived-at: Mon, 02 Oct 2017 19:21:30 -0000 Modified: tomcat/tc7.0.x/trunk/java/org/apache/catalina/connector/Request.java URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/connector/Request.java?rev=1810580&r1=1810579&r2=1810580&view=diff ============================================================================== --- tomcat/tc7.0.x/trunk/java/org/apache/catalina/connector/Request.java (original) +++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/connector/Request.java Mon Oct 2 19:21:18 2017 @@ -115,7 +115,7 @@ import org.ietf.jgss.GSSException; * @author Craig R. McClanahan */ public class Request - implements HttpServletRequest { +implements HttpServletRequest { private static final Log log = LogFactory.getLog(Request.class); @@ -167,7 +167,7 @@ public class Request * The string manager for this package. */ protected static final StringManager sm = - StringManager.getManager(Constants.Package); + StringManager.getManager(Constants.Package); /** @@ -183,9 +183,9 @@ public class Request * declare formats[] as a static variable. */ protected SimpleDateFormat formats[] = { - new SimpleDateFormat("EEE, dd MMM yyyy HH:mm:ss zzz", Locale.US), - new SimpleDateFormat("EEEEEE, dd-MMM-yy HH:mm:ss zzz", Locale.US), - new SimpleDateFormat("EEE MMMM d HH:mm:ss yyyy", Locale.US) + new SimpleDateFormat("EEE, dd MMM yyyy HH:mm:ss zzz", Locale.US), + new SimpleDateFormat("EEEEEE, dd-MMM-yy HH:mm:ss zzz", Locale.US), + new SimpleDateFormat("EEE MMMM d HH:mm:ss yyyy", Locale.US) }; @@ -256,7 +256,7 @@ public class Request * ServletInputStream. */ protected CoyoteInputStream inputStream = - new CoyoteInputStream(inputBuffer); + new CoyoteInputStream(inputBuffer); /** @@ -669,7 +669,7 @@ public class Request * Descriptive information about this Request implementation. */ protected static final String info = - "org.apache.coyote.catalina.CoyoteRequest/1.0"; + "org.apache.coyote.catalina.CoyoteRequest/1.0"; /** * Return descriptive information about this Request implementation and @@ -798,7 +798,7 @@ public class Request * @exception IOException if an input/output error occurs */ public ServletInputStream createInputStream() - throws IOException { + throws IOException { if (inputStream == null) { inputStream = new CoyoteInputStream(inputBuffer); } @@ -959,7 +959,7 @@ public class Request } if( isSSLAttribute(name) || name.equals(SSLSupport.PROTOCOL_VERSION_KEY)) { coyoteRequest.action(ActionCode.REQ_SSL_ATTRIBUTE, - coyoteRequest); + coyoteRequest); attr = coyoteRequest.getAttribute(Globals.CERTIFICATES_ATTR); if( attr != null) { attributes.put(Globals.CERTIFICATES_ATTR, attr); @@ -997,11 +997,11 @@ public class Request */ static boolean isSSLAttribute(String name) { return Globals.CERTIFICATES_ATTR.equals(name) || - Globals.CIPHER_SUITE_ATTR.equals(name) || - Globals.KEY_SIZE_ATTR.equals(name) || - Globals.SSL_SESSION_ID_ATTR.equals(name) || - Globals.SSL_SESSION_ID_TOMCAT_ATTR.equals(name) || - Globals.SSL_SESSION_MGR_ATTR.equals(name); + Globals.CIPHER_SUITE_ATTR.equals(name) || + Globals.KEY_SIZE_ATTR.equals(name) || + Globals.SSL_SESSION_ID_ATTR.equals(name) || + Globals.SSL_SESSION_ID_TOMCAT_ATTR.equals(name) || + Globals.SSL_SESSION_MGR_ATTR.equals(name); } /** @@ -1052,7 +1052,7 @@ public class Request */ @Override public String getCharacterEncoding() { - return coyoteRequest.getCharacterEncoding(); + return coyoteRequest.getCharacterEncoding(); } @@ -1088,7 +1088,7 @@ public class Request if (usingReader) { throw new IllegalStateException - (sm.getString("coyoteRequest.getInputStream.ise")); + (sm.getString("coyoteRequest.getInputStream.ise")); } usingInputStream = true; @@ -1250,7 +1250,7 @@ public class Request if (usingInputStream) { throw new IllegalStateException - (sm.getString("coyoteRequest.getReader.ise")); + (sm.getString("coyoteRequest.getReader.ise")); } usingReader = true; @@ -1298,7 +1298,7 @@ public class Request public String getRemoteAddr() { if (remoteAddr == null) { coyoteRequest.action - (ActionCode.REQ_HOST_ADDR_ATTRIBUTE, coyoteRequest); + (ActionCode.REQ_HOST_ADDR_ATTRIBUTE, coyoteRequest); remoteAddr = coyoteRequest.remoteAddr().toString(); } return remoteAddr; @@ -1315,7 +1315,7 @@ public class Request remoteHost = getRemoteAddr(); } else { coyoteRequest.action - (ActionCode.REQ_HOST_ATTRIBUTE, coyoteRequest); + (ActionCode.REQ_HOST_ATTRIBUTE, coyoteRequest); remoteHost = coyoteRequest.remoteHost().toString(); } } @@ -1330,7 +1330,7 @@ public class Request public int getRemotePort(){ if (remotePort == -1) { coyoteRequest.action - (ActionCode.REQ_REMOTEPORT_ATTRIBUTE, coyoteRequest); + (ActionCode.REQ_REMOTEPORT_ATTRIBUTE, coyoteRequest); remotePort = coyoteRequest.getRemotePort(); } return remotePort; @@ -1344,7 +1344,7 @@ public class Request public String getLocalName(){ if (localName == null) { coyoteRequest.action - (ActionCode.REQ_LOCAL_NAME_ATTRIBUTE, coyoteRequest); + (ActionCode.REQ_LOCAL_NAME_ATTRIBUTE, coyoteRequest); localName = coyoteRequest.localName().toString(); } return localName; @@ -1358,7 +1358,7 @@ public class Request public String getLocalAddr(){ if (localAddr == null) { coyoteRequest.action - (ActionCode.REQ_LOCAL_ADDR_ATTRIBUTE, coyoteRequest); + (ActionCode.REQ_LOCAL_ADDR_ATTRIBUTE, coyoteRequest); localAddr = coyoteRequest.localAddr().toString(); } return localAddr; @@ -1373,7 +1373,7 @@ public class Request public int getLocalPort(){ if (localPort == -1){ coyoteRequest.action - (ActionCode.REQ_LOCALPORT_ATTRIBUTE, coyoteRequest); + (ActionCode.REQ_LOCALPORT_ATTRIBUTE, coyoteRequest); localPort = coyoteRequest.getLocalPort(); } return localPort; @@ -1511,7 +1511,7 @@ public class Request // Name cannot be null if (name == null) { throw new IllegalArgumentException - (sm.getString("coyoteRequest.setAttribute.namenull")); + (sm.getString("coyoteRequest.setAttribute.namenull")); } // Null value is the same as removeAttribute() @@ -1584,7 +1584,7 @@ public class Request continue; } ServletRequestAttributeListener listener = - (ServletRequestAttributeListener) listeners[i]; + (ServletRequestAttributeListener) listeners[i]; try { if (replaced) { listener.attributeReplaced(event); @@ -1610,14 +1610,14 @@ public class Request return; } ServletRequestAttributeEvent event = - new ServletRequestAttributeEvent(context.getServletContext(), - getRequest(), name, value); + new ServletRequestAttributeEvent(context.getServletContext(), + getRequest(), name, value); for (int i = 0; i < listeners.length; i++) { if (!(listeners[i] instanceof ServletRequestAttributeListener)) { continue; } ServletRequestAttributeListener listener = - (ServletRequestAttributeListener) listeners[i]; + (ServletRequestAttributeListener) listeners[i]; try { listener.attributeRemoved(event); } catch (Throwable t) { @@ -1644,7 +1644,7 @@ public class Request */ @Override public void setCharacterEncoding(String enc) - throws UnsupportedEncodingException { + throws UnsupportedEncodingException { if (usingReader) { return; @@ -1661,7 +1661,7 @@ public class Request @Override public ServletContext getServletContext() { return context.getServletContext(); - } + } @Override public AsyncContext startAsync() { @@ -2019,7 +2019,6 @@ public class Request // --------------------------------------------- HttpServletRequest Methods - /** * Return the authentication type used for this Request. */ @@ -2376,7 +2375,7 @@ public class Request String scheme = getScheme(); int port = getServerPort(); if (port < 0) - { + { port = 80; // Work around java.net.URL bug } @@ -2384,7 +2383,7 @@ public class Request url.append("://"); url.append(getServerName()); if ((scheme.equals("http") && (port != 80)) - || (scheme.equals("https") && (port != 443))) { + || (scheme.equals("https") && (port != 443))) { url.append(':'); url.append(port); } @@ -2645,8 +2644,8 @@ public class Request if (response != null) { Cookie newCookie = - ApplicationSessionCookieConfig.createSessionCookie(context, - newSessionId, secure); + ApplicationSessionCookieConfig.createSessionCookie(context, + newSessionId, secure); response.addSessionCookieInternal(newCookie); } } @@ -2740,7 +2739,7 @@ public class Request */ @Override public boolean authenticate(HttpServletResponse response) - throws IOException, ServletException { + throws IOException, ServletException { if (response.isCommitted()) { throw new IllegalStateException( sm.getString("coyoteRequest.authenticate.ise")); @@ -2754,7 +2753,7 @@ public class Request */ @Override public void login(String username, String password) - throws ServletException { + throws ServletException { if (getAuthType() != null || getRemoteUser() != null || getUserPrincipal() != null) { throw new ServletException( @@ -2781,7 +2780,7 @@ public class Request */ @Override public Collection getParts() throws IOException, IllegalStateException, - ServletException { + ServletException { parseParts(); @@ -2810,9 +2809,9 @@ public class Request if (mce == null) { if(getContext().getAllowCasualMultipartParsing()) { mce = new MultipartConfigElement(null, - connector.getMaxPostSize(), - connector.getMaxPostSize(), - connector.getMaxPostSize()); + connector.getMaxPostSize(), + connector.getMaxPostSize(), + connector.getMaxPostSize()); } else { parts = Collections.emptyList(); return; @@ -2835,8 +2834,8 @@ public class Request if (!location.isAbsolute()) { location = new File( (File) context.getServletContext().getAttribute( - ServletContext.TEMPDIR), - locationStr).getAbsoluteFile(); + ServletContext.TEMPDIR), + locationStr).getAbsoluteFile(); } } @@ -2959,7 +2958,7 @@ public class Request */ @Override public Part getPart(String name) throws IOException, IllegalStateException, - ServletException { + ServletException { Collection c = getParts(); Iterator iterator = c.iterator(); while (iterator.hasNext()) { @@ -2995,7 +2994,7 @@ public class Request @SuppressWarnings("unchecked") public T upgrade( Class httpUpgradeHandlerClass) throws ServletException { - + T handler; try { handler = (T) context.getInstanceManager().newInstance(httpUpgradeHandlerClass); @@ -3007,6 +3006,12 @@ public class Request throw new ServletException(e); } catch (NamingException e) { throw new ServletException(e); + } catch (IllegalArgumentException e) { + throw new ServletException(e); + } catch (SecurityException e) { + throw new ServletException(e); + } catch (NoSuchMethodException e) { + throw new ServletException(e); } coyoteRequest.action(ActionCode.UPGRADE, handler); @@ -3063,11 +3068,11 @@ public class Request return (null); } if ((response != null) && - context.getServletContext().getEffectiveSessionTrackingModes(). - contains(SessionTrackingMode.COOKIE) && - response.getResponse().isCommitted()) { + context.getServletContext().getEffectiveSessionTrackingModes(). + contains(SessionTrackingMode.COOKIE) && + response.getResponse().isCommitted()) { throw new IllegalStateException - (sm.getString("coyoteRequest.sessionCreateCommitted")); + (sm.getString("coyoteRequest.sessionCreateCommitted")); } // Re-use session IDs provided by the client in very limited @@ -3115,12 +3120,12 @@ public class Request // Creating a new session cookie based on that session if ((session != null) && (getContext() != null) - && getContext().getServletContext(). - getEffectiveSessionTrackingModes().contains( - SessionTrackingMode.COOKIE)) { + && getContext().getServletContext(). + getEffectiveSessionTrackingModes().contains( + SessionTrackingMode.COOKIE)) { Cookie cookie = - ApplicationSessionCookieConfig.createSessionCookie( - context, session.getIdInternal(), isSecure()); + ApplicationSessionCookieConfig.createSessionCookie( + context, session.getIdInternal(), isSecure()); response.addSessionCookieInternal(cookie); } @@ -3147,7 +3152,7 @@ public class Request buf.append(c); } else { if (++i >= s.length()) - { + { throw new IllegalArgumentException();//invalid escape, hence invalid cookie } c = s.charAt(i); @@ -3178,7 +3183,7 @@ public class Request try { /* we must unescape the '\\' escape character - */ + */ Cookie cookie = new Cookie(scookie.getName().toString(),null); int version = scookie.getVersion(); cookie.setVersion(version); @@ -3186,7 +3191,7 @@ public class Request cookie.setPath(unescape(scookie.getPath().toString())); String domain = scookie.getDomain().toString(); if (domain!=null) - { + { cookie.setDomain(unescape(domain));//avoid NPE } String comment = scookie.getComment().toString(); @@ -3229,10 +3234,10 @@ public class Request } } else { parameters.setEncoding - (org.apache.coyote.Constants.DEFAULT_CHARACTER_ENCODING); + (org.apache.coyote.Constants.DEFAULT_CHARACTER_ENCODING); if (useBodyEncodingForURI) { parameters.setQueryStringEncoding - (org.apache.coyote.Constants.DEFAULT_CHARACTER_ENCODING); + (org.apache.coyote.Constants.DEFAULT_CHARACTER_ENCODING); } } @@ -3350,7 +3355,7 @@ public class Request * Read post body in an array. */ protected int readPostBody(byte body[], int len) - throws IOException { + throws IOException { int offset = 0; do { @@ -3456,7 +3461,7 @@ public class Request } JreCompat jreCompat = JreCompat.getInstance(); - + // Process each comma-delimited language specification int length = parser.getLength(); while (true) { @@ -3489,11 +3494,11 @@ public class Request // Skip entries we are not going to keep track of if (quality < 0.00005) - { + { continue; // Zero (or effectively zero) quality factors } if ("*".equals(entry)) - { + { continue; // FIXME - "*" entries are not handled } @@ -3525,93 +3530,93 @@ public class Request } private static final Map specialAttributes - = new HashMap(); + = new HashMap(); static { specialAttributes.put(Globals.DISPATCHER_TYPE_ATTR, new SpecialAttributeAdapter() { - @Override - public Object get(Request request, String name) { - return (request.internalDispatcherType == null) ? DispatcherType.REQUEST - : request.internalDispatcherType; - } + @Override + public Object get(Request request, String name) { + return (request.internalDispatcherType == null) ? DispatcherType.REQUEST + : request.internalDispatcherType; + } - @Override - public void set(Request request, String name, Object value) { - request.internalDispatcherType = (DispatcherType) value; - } - }); + @Override + public void set(Request request, String name, Object value) { + request.internalDispatcherType = (DispatcherType) value; + } + }); specialAttributes.put(Globals.DISPATCHER_REQUEST_PATH_ATTR, new SpecialAttributeAdapter() { - @Override - public Object get(Request request, String name) { - return (request.requestDispatcherPath == null) ? request - .getRequestPathMB().toString() - : request.requestDispatcherPath.toString(); - } + @Override + public Object get(Request request, String name) { + return (request.requestDispatcherPath == null) ? request + .getRequestPathMB().toString() + : request.requestDispatcherPath.toString(); + } - @Override - public void set(Request request, String name, Object value) { - request.requestDispatcherPath = value; - } - }); + @Override + public void set(Request request, String name, Object value) { + request.requestDispatcherPath = value; + } + }); specialAttributes.put(Globals.ASYNC_SUPPORTED_ATTR, new SpecialAttributeAdapter() { - @Override - public Object get(Request request, String name) { - return request.asyncSupported; - } + @Override + public Object get(Request request, String name) { + return request.asyncSupported; + } - @Override - public void set(Request request, String name, Object value) { - Boolean oldValue = request.asyncSupported; - request.asyncSupported = (Boolean)value; - request.notifyAttributeAssigned(name, value, oldValue); - } - }); + @Override + public void set(Request request, String name, Object value) { + Boolean oldValue = request.asyncSupported; + request.asyncSupported = (Boolean)value; + request.notifyAttributeAssigned(name, value, oldValue); + } + }); specialAttributes.put(Globals.GSS_CREDENTIAL_ATTR, new SpecialAttributeAdapter() { - @Override - public Object get(Request request, String name) { - if (request.userPrincipal instanceof GenericPrincipal) { - return ((GenericPrincipal) request.userPrincipal) - .getGssCredential(); - } - return null; - } + @Override + public Object get(Request request, String name) { + if (request.userPrincipal instanceof GenericPrincipal) { + return ((GenericPrincipal) request.userPrincipal) + .getGssCredential(); + } + return null; + } - @Override - public void set(Request request, String name, Object value) { - // NO-OP - } - }); + @Override + public void set(Request request, String name, Object value) { + // NO-OP + } + }); specialAttributes.put(Globals.PARAMETER_PARSE_FAILED_ATTR, new SpecialAttributeAdapter() { - @Override - public Object get(Request request, String name) { - if (request.getCoyoteRequest().getParameters() - .isParseFailed()) { - return Boolean.TRUE; - } - return null; - } + @Override + public Object get(Request request, String name) { + if (request.getCoyoteRequest().getParameters() + .isParseFailed()) { + return Boolean.TRUE; + } + return null; + } - @Override - public void set(Request request, String name, Object value) { - // NO-OP - } - }); + @Override + public void set(Request request, String name, Object value) { + // NO-OP + } + }); specialAttributes.put(Globals.PARAMETER_PARSE_FAILED_REASON_ATTR, new SpecialAttributeAdapter() { - @Override - public Object get(Request request, String name) { - return request.getCoyoteRequest().getParameters().getParseFailedReason(); - } + @Override + public Object get(Request request, String name) { + return request.getCoyoteRequest().getParameters().getParseFailedReason(); + } - @Override - public void set(Request request, String name, Object value) { - // NO-OP - } - }); + @Override + public void set(Request request, String name, Object value) { + // NO-OP + } + }); } } Modified: tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/ApplicationContext.java URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/ApplicationContext.java?rev=1810580&r1=1810579&r2=1810580&view=diff ============================================================================== --- tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/ApplicationContext.java (original) +++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/ApplicationContext.java Mon Oct 2 19:21:18 2017 @@ -134,7 +134,7 @@ public class ApplicationContext implemen * The context attributes for this context. */ protected Map attributes = - new ConcurrentHashMap(); + new ConcurrentHashMap(); /** @@ -176,14 +176,14 @@ public class ApplicationContext implemen * The string manager for this package. */ private static final StringManager sm = - StringManager.getManager(Constants.Package); + StringManager.getManager(Constants.Package); /** * Thread local data used during request dispatch. */ private ThreadLocal dispatchData = - new ThreadLocal(); + new ThreadLocal(); /** @@ -589,7 +589,7 @@ public class ApplicationContext implemen */ @Override public URL getResource(String path) - throws MalformedURLException { + throws MalformedURLException { if (path == null || !path.startsWith("/") && GET_RESOURCE_REQUIRE_SLASH) @@ -680,7 +680,7 @@ public class ApplicationContext implemen } if (!path.startsWith("/")) { throw new IllegalArgumentException - (sm.getString("applicationContext.resourcePaths.iae", path)); + (sm.getString("applicationContext.resourcePaths.iae", path)); } String normalizedPath; @@ -850,23 +850,23 @@ public class ApplicationContext implemen if ((listeners == null) || (listeners.length == 0)) return; ServletContextAttributeEvent event = - new ServletContextAttributeEvent(context.getServletContext(), - name, value); + new ServletContextAttributeEvent(context.getServletContext(), + name, value); for (int i = 0; i < listeners.length; i++) { if (!(listeners[i] instanceof ServletContextAttributeListener)) continue; ServletContextAttributeListener listener = - (ServletContextAttributeListener) listeners[i]; + (ServletContextAttributeListener) listeners[i]; try { context.fireContainerEvent("beforeContextAttributeRemoved", - listener); + listener); listener.attributeRemoved(event); context.fireContainerEvent("afterContextAttributeRemoved", - listener); + listener); } catch (Throwable t) { ExceptionUtils.handleThrowable(t); context.fireContainerEvent("afterContextAttributeRemoved", - listener); + listener); // FIXME - should we do anything besides log these? log(sm.getString("applicationContext.attributeEvent"), t); } @@ -888,7 +888,7 @@ public class ApplicationContext implemen // Name cannot be null if (name == null) throw new IllegalArgumentException - (sm.getString("applicationContext.setAttribute.namenull")); + (sm.getString("applicationContext.setAttribute.namenull")); // Null value is the same as removeAttribute() if (value == null) { @@ -911,40 +911,40 @@ public class ApplicationContext implemen ServletContextAttributeEvent event = null; if (replaced) event = - new ServletContextAttributeEvent(context.getServletContext(), - name, oldValue); + new ServletContextAttributeEvent(context.getServletContext(), + name, oldValue); else event = - new ServletContextAttributeEvent(context.getServletContext(), - name, value); + new ServletContextAttributeEvent(context.getServletContext(), + name, value); for (int i = 0; i < listeners.length; i++) { if (!(listeners[i] instanceof ServletContextAttributeListener)) continue; ServletContextAttributeListener listener = - (ServletContextAttributeListener) listeners[i]; + (ServletContextAttributeListener) listeners[i]; try { if (replaced) { context.fireContainerEvent - ("beforeContextAttributeReplaced", listener); + ("beforeContextAttributeReplaced", listener); listener.attributeReplaced(event); context.fireContainerEvent("afterContextAttributeReplaced", - listener); + listener); } else { context.fireContainerEvent("beforeContextAttributeAdded", - listener); + listener); listener.attributeAdded(event); context.fireContainerEvent("afterContextAttributeAdded", - listener); + listener); } } catch (Throwable t) { ExceptionUtils.handleThrowable(t); if (replaced) context.fireContainerEvent("afterContextAttributeReplaced", - listener); + listener); else context.fireContainerEvent("afterContextAttributeAdded", - listener); + listener); // FIXME - should we do anything besides log these? log(sm.getString("applicationContext.attributeEvent"), t); } @@ -1060,22 +1060,24 @@ public class ApplicationContext implemen @Override public T createFilter(Class c) - throws ServletException { + throws ServletException { try { @SuppressWarnings("unchecked") T filter = (T) context.getInstanceManager().newInstance(c.getName()); return filter; - } catch (IllegalAccessException e) { - throw new ServletException(e); } catch (InvocationTargetException e) { ExceptionUtils.handleThrowable(e.getCause()); throw new ServletException(e); + } catch (IllegalAccessException e) { + throw new ServletException(e); } catch (NamingException e) { throw new ServletException(e); } catch (InstantiationException e) { throw new ServletException(e); } catch (ClassNotFoundException e) { throw new ServletException(e); + } catch (NoSuchMethodException e) { + throw new ServletException(e); } } @@ -1151,7 +1153,7 @@ public class ApplicationContext implemen @Override public ServletRegistration.Dynamic addServlet(String servletName, Class servletClass) - throws IllegalStateException { + throws IllegalStateException { return addServlet(servletName, servletClass.getName(), null); } @@ -1203,23 +1205,25 @@ public class ApplicationContext implemen @Override public T createServlet(Class c) - throws ServletException { + throws ServletException { try { @SuppressWarnings("unchecked") T servlet = (T) context.getInstanceManager().newInstance(c.getName()); context.dynamicServletCreated(servlet); return servlet; - } catch (IllegalAccessException e) { - throw new ServletException(e); } catch (InvocationTargetException e) { ExceptionUtils.handleThrowable(e.getCause()); throw new ServletException(e); + } catch (IllegalAccessException e) { + throw new ServletException(e); } catch (NamingException e) { throw new ServletException(e); } catch (InstantiationException e) { throw new ServletException(e); } catch (ClassNotFoundException e) { throw new ServletException(e); + } catch (NoSuchMethodException e) { + throw new ServletException(e); } } @@ -1370,12 +1374,12 @@ public class ApplicationContext implemen EventListener listener = (EventListener) obj; addListener(listener); } - } catch (IllegalAccessException e) { + } catch (InvocationTargetException e) { + ExceptionUtils.handleThrowable(e.getCause()); throw new IllegalArgumentException(sm.getString( "applicationContext.addListener.iae.cnfe", className), e); - } catch (InvocationTargetException e) { - ExceptionUtils.handleThrowable(e.getCause()); + } catch (IllegalAccessException e) { throw new IllegalArgumentException(sm.getString( "applicationContext.addListener.iae.cnfe", className), e); @@ -1391,6 +1395,10 @@ public class ApplicationContext implemen throw new IllegalArgumentException(sm.getString( "applicationContext.addListener.iae.cnfe", className), e); + } catch (NoSuchMethodException e) { + throw new IllegalArgumentException(sm.getString( + "applicationContext.addListener.iae.cnfe", className), + e); } } @@ -1442,7 +1450,7 @@ public class ApplicationContext implemen try { @SuppressWarnings("unchecked") T listener = - (T) context.getInstanceManager().newInstance(c); + (T) context.getInstanceManager().newInstance(c); if (listener instanceof ServletContextListener || listener instanceof ServletContextAttributeListener || listener instanceof ServletRequestListener || @@ -1454,15 +1462,17 @@ public class ApplicationContext implemen throw new IllegalArgumentException(sm.getString( "applicationContext.addListener.iae.wrongType", listener.getClass().getName())); - } catch (IllegalAccessException e) { - throw new ServletException(e); } catch (InvocationTargetException e) { ExceptionUtils.handleThrowable(e.getCause()); throw new ServletException(e); + } catch (IllegalAccessException e) { + throw new ServletException(e); } catch (NamingException e) { throw new ServletException(e); } catch (InstantiationException e) { throw new ServletException(e); + } catch (NoSuchMethodException e) { + throw new ServletException(e); } } @@ -1531,7 +1541,7 @@ public class ApplicationContext implemen @Override public Map getFilterRegistrations() { Map result = - new HashMap(); + new HashMap(); FilterDef[] filterDefs = context.findFilterDefs(); for (FilterDef filterDef : filterDefs) { @@ -1559,7 +1569,7 @@ public class ApplicationContext implemen @Override public Map getServletRegistrations() { Map result = - new HashMap(); + new HashMap(); Container[] wrappers = context.findChildren(); for (Container wrapper : wrappers) { Modified: tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/ApplicationFilterConfig.java URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/ApplicationFilterConfig.java?rev=1810580&r1=1810579&r2=1810580&view=diff ============================================================================== --- tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/ApplicationFilterConfig.java (original) +++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/ApplicationFilterConfig.java Mon Oct 2 19:21:18 2017 @@ -90,11 +90,14 @@ public final class ApplicationFilterConf * @exception ServletException if thrown by the filter's init() method * @throws NamingException * @throws InvocationTargetException + * @throws SecurityException + * @throws NoSuchMethodException + * @throws IllegalArgumentException */ ApplicationFilterConfig(Context context, FilterDef filterDef) - throws ClassCastException, ClassNotFoundException, - IllegalAccessException, InstantiationException, - ServletException, InvocationTargetException, NamingException { + throws ClassCastException, ClassNotFoundException, IllegalAccessException, + InstantiationException, ServletException, InvocationTargetException, NamingException, + IllegalArgumentException, NoSuchMethodException, SecurityException { super(); @@ -244,10 +247,13 @@ public final class ApplicationFilterConf * @exception ServletException if thrown by the filter's init() method * @throws NamingException * @throws InvocationTargetException - */ - Filter getFilter() throws ClassCastException, ClassNotFoundException, - IllegalAccessException, InstantiationException, ServletException, - InvocationTargetException, NamingException { + * @throws SecurityException + * @throws NoSuchMethodException + * @throws IllegalArgumentException + */ + Filter getFilter() throws ClassCastException, ClassNotFoundException, IllegalAccessException, + InstantiationException, ServletException, InvocationTargetException, NamingException, + IllegalArgumentException, NoSuchMethodException, SecurityException { // Return the existing filter instance, if any if (this.filter != null) --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org For additional commands, e-mail: dev-help@tomcat.apache.org