Index: 3rdParty_sources/servlet-api/javax/servlet/http/HttpServlet.java =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r188531e2b734df509672788d897e1030e4b1a24a --- 3rdParty_sources/servlet-api/javax/servlet/http/HttpServlet.java (.../HttpServlet.java) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ 3rdParty_sources/servlet-api/javax/servlet/http/HttpServlet.java (.../HttpServlet.java) (revision 188531e2b734df509672788d897e1030e4b1a24a) @@ -1,7 +1,7 @@ /* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. * - * Copyright (c) 1997-2013 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997-2017 Oracle and/or its affiliates. All rights reserved. * * The contents of this file are subject to the terms of either the GNU * General Public License Version 2 only ("GPL") or the Common Development @@ -65,7 +65,6 @@ import java.lang.reflect.Method; import java.text.MessageFormat; import java.util.Enumeration; -import java.util.Locale; import java.util.ResourceBundle; import javax.servlet.*; @@ -106,7 +105,7 @@ * such as files, database connections, and network * connections. * See the - * + * * Java Tutorial on Multithreaded Programming for more * information on handling multiple threads in a Java program. * @@ -196,11 +195,11 @@ * contains the response the servlet sends * to the client * - * @exception IOException if an input or output error is + * @throws IOException if an input or output error is * detected when the servlet handles * the GET request * - * @exception ServletException if the request for the GET + * @throws ServletException if the request for the GET * could not be handled * * @see javax.servlet.ServletResponse#setContentType @@ -275,9 +274,9 @@ * @param resp the response object that the servlet * uses to return the headers to the clien * - * @exception IOException if an input or output error occurs + * @throws IOException if an input or output error occurs * - * @exception ServletException if the request for the HEAD + * @throws ServletException if the request for the HEAD * could not be handled */ protected void doHead(HttpServletRequest req, HttpServletResponse resp) @@ -338,11 +337,11 @@ * contains the response the servlet sends * to the client * - * @exception IOException if an input or output error is + * @throws IOException if an input or output error is * detected when the servlet handles * the request * - * @exception ServletException if the request for the POST + * @throws ServletException if the request for the POST * could not be handled * * @see javax.servlet.ServletOutputStream @@ -396,11 +395,11 @@ * contains the response the servlet returns * to the client * - * @exception IOException if an input or output error occurs + * @throws IOException if an input or output error occurs * while the servlet is handling the * PUT request * - * @exception ServletException if the request for the PUT + * @throws ServletException if the request for the PUT * cannot be handled */ protected void doPut(HttpServletRequest req, HttpServletResponse resp) @@ -442,11 +441,11 @@ * contains the response the servlet returns * to the client * - * @exception IOException if an input or output error occurs + * @throws IOException if an input or output error occurs * while the servlet is handling the * DELETE request * - * @exception ServletException if the request for the + * @throws ServletException if the request for the * DELETE cannot be handled */ protected void doDelete(HttpServletRequest req, @@ -513,11 +512,11 @@ * contains the response the servlet returns * to the client * - * @exception IOException if an input or output error occurs + * @throws IOException if an input or output error occurs * while the servlet is handling the * OPTIONS request * - * @exception ServletException if the request for the + * @throws ServletException if the request for the * OPTIONS cannot be handled */ protected void doOptions(HttpServletRequest req, HttpServletResponse resp) @@ -613,11 +612,11 @@ * contains the response the servlet returns * to the client * - * @exception IOException if an input or output error occurs + * @throws IOException if an input or output error occurs * while the servlet is handling the * TRACE request * - * @exception ServletException if the request for the + * @throws ServletException if the request for the * TRACE cannot be handled */ protected void doTrace(HttpServletRequest req, HttpServletResponse resp) @@ -665,11 +664,11 @@ * contains the response the servlet returns * to the client * - * @exception IOException if an input or output error occurs + * @throws IOException if an input or output error occurs * while the servlet is handling the * HTTP request * - * @exception ServletException if the HTTP request + * @throws ServletException if the HTTP request * cannot be handled * * @see javax.servlet.Servlet#service @@ -763,12 +762,14 @@ * contains the response the servlet returns * to the client * - * @exception IOException if an input or output error occurs + * @throws IOException if an input or output error occurs * while the servlet is handling the * HTTP request * - * @exception ServletException if the HTTP request cannot - * be handled + * @throws ServletException if the HTTP request cannot + * be handled or if either parameter is not + * an instance of its respective {@link HttpServletRequest} + * or {@link HttpServletResponse} counterparts. * * @see javax.servlet.Servlet#service */