You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2023/11/08 10:37:43 UTC

(tomcat) branch 9.0.x updated: Code clean-up - formatting. No functional change.

This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/9.0.x by this push:
     new 5d7b763b35 Code clean-up - formatting. No functional change.
5d7b763b35 is described below

commit 5d7b763b355717a2293e888f8b6f1005ecae22a6
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Wed Nov 8 10:37:32 2023 +0000

    Code clean-up - formatting. No functional change.
---
 java/org/apache/catalina/servlets/CGIServlet.java  | 735 +++++++-----------
 .../apache/catalina/servlets/DefaultServlet.java   | 752 ++++++++-----------
 .../apache/catalina/servlets/WebdavServlet.java    | 828 ++++++++++-----------
 3 files changed, 1012 insertions(+), 1303 deletions(-)

diff --git a/java/org/apache/catalina/servlets/CGIServlet.java b/java/org/apache/catalina/servlets/CGIServlet.java
index 9113ab675f..bdbeffb032 100644
--- a/java/org/apache/catalina/servlets/CGIServlet.java
+++ b/java/org/apache/catalina/servlets/CGIServlet.java
@@ -56,20 +56,15 @@ import org.apache.tomcat.util.res.StringManager;
 
 
 /**
- *  CGI-invoking servlet for web applications, used to execute scripts which
- *  comply to the Common Gateway Interface (CGI) specification and are named
- *  in the path-info used to invoke this servlet.
- *
+ * CGI-invoking servlet for web applications, used to execute scripts which comply to the Common Gateway Interface (CGI)
+ * specification and are named in the path-info used to invoke this servlet.
  * <p>
- * <i>Note: This code compiles and even works for simple CGI cases.
- *          Exhaustive testing has not been done.  Please consider it beta
- *          quality.  Feedback is appreciated to the author (see below).</i>
+ * <i>Note: This code compiles and even works for simple CGI cases. Exhaustive testing has not been done. Please
+ * consider it beta quality. Feedback is appreciated to the author (see below).</i>
  * </p>
  * <p>
- *
  * <b>Example</b>:<br>
- * If an instance of this servlet was mapped (using
- *       <code>&lt;web-app&gt;/WEB-INF/web.xml</code>) to:
+ * If an instance of this servlet was mapped (using <code>&lt;web-app&gt;/WEB-INF/web.xml</code>) to:
  * </p>
  * <p>
  * <code>
@@ -96,47 +91,33 @@ import org.apache.tomcat.util.res.StringManager;
  * with the script's <code>PATH_INFO</code> set to <code>/pathinfo1</code>.
  * </p>
  * <p>
- * Recommendation:  House all your CGI scripts under
- * <code>&lt;webapp&gt;/WEB-INF/cgi</code>.  This will ensure that you do not
- * accidentally expose your cgi scripts' code to the outside world and that
- * your cgis will be cleanly ensconced underneath the WEB-INF (i.e.,
- * non-content) area.
+ * Recommendation: House all your CGI scripts under <code>&lt;webapp&gt;/WEB-INF/cgi</code>. This will ensure that you
+ * do not accidentally expose your cgi scripts' code to the outside world and that your cgis will be cleanly ensconced
+ * underneath the WEB-INF (i.e., non-content) area.
  * </p>
  * <p>
- * The default CGI location is mentioned above.  You have the flexibility to
- * put CGIs wherever you want, however:
+ * The default CGI location is mentioned above. You have the flexibility to put CGIs wherever you want, however:
  * </p>
  * <p>
- *   The CGI search path will start at
- *   webAppRootDir + File.separator + cgiPathPrefix
- *   (or webAppRootDir alone if cgiPathPrefix is
- *   null).
+ * The CGI search path will start at webAppRootDir + File.separator + cgiPathPrefix (or webAppRootDir alone if
+ * cgiPathPrefix is null).
  * </p>
  * <p>
- *   cgiPathPrefix is defined by setting
- *   this servlet's cgiPathPrefix init parameter
+ * cgiPathPrefix is defined by setting this servlet's cgiPathPrefix init parameter
  * </p>
- *
  * <p>
- *
- * <B>CGI Specification</B>:<br> derived from
- * <a href="http://cgi-spec.golux.com">http://cgi-spec.golux.com</a>.
- * A work-in-progress &amp; expired Internet Draft.  Note no actual RFC describing
- * the CGI specification exists.  Where the behavior of this servlet differs
- * from the specification cited above, it is either documented here, a bug,
- * or an instance where the specification cited differs from Best
- * Community Practice (BCP).
- * Such instances should be well-documented here.  Please email the
- * <a href="https://tomcat.apache.org/lists.html">Tomcat group</a>
- * with amendments.
- *
+ * <B>CGI Specification</B>:<br>
+ * derived from <a href="http://cgi-spec.golux.com">http://cgi-spec.golux.com</a>. A work-in-progress &amp; expired
+ * Internet Draft. Note no actual RFC describing the CGI specification exists. Where the behavior of this servlet
+ * differs from the specification cited above, it is either documented here, a bug, or an instance where the
+ * specification cited differs from Best Community Practice (BCP). Such instances should be well-documented here. Please
+ * email the <a href="https://tomcat.apache.org/lists.html">Tomcat group</a> with amendments.
  * </p>
  * <p>
- *
  * <b>Canonical metavariables</b>:<br>
- * The CGI specification defines the following canonical metavariables:
- * <br>
+ * The CGI specification defines the following canonical metavariables: <br>
  * [excerpt from CGI specification]
+ *
  * <PRE>
  *  AUTH_TYPE
  *  CONTENT_LENGTH
@@ -157,79 +138,58 @@ import org.apache.tomcat.util.res.StringManager;
  *  SERVER_SOFTWARE
  * </PRE>
  * <p>
- * Metavariables with names beginning with the protocol name (<EM>e.g.</EM>,
- * "HTTP_ACCEPT") are also canonical in their description of request header
- * fields.  The number and meaning of these fields may change independently
- * of this specification.  (See also section 6.1.5 [of the CGI specification].)
+ * Metavariables with names beginning with the protocol name (<EM>e.g.</EM>, "HTTP_ACCEPT") are also canonical in their
+ * description of request header fields. The number and meaning of these fields may change independently of this
+ * specification. (See also section 6.1.5 [of the CGI specification].)
  * </p>
  * [end excerpt]
- *
- * <h2> Implementation notes</h2>
+ * <h2>Implementation notes</h2>
  * <p>
- *
- * <b>standard input handling</b>: If your script accepts standard input,
- * then the client must start sending input within a certain timeout period,
- * otherwise the servlet will assume no input is coming and carry on running
- * the script.  The script's the standard input will be closed and handling of
- * any further input from the client is undefined.  Most likely it will be
- * ignored.  If this behavior becomes undesirable, then this servlet needs
- * to be enhanced to handle threading of the spawned process' stdin, stdout,
- * and stderr (which should not be too hard).
- * <br>
- * If you find your cgi scripts are timing out receiving input, you can set
- * the init parameter <code>stderrTimeout</code> of your webapps' cgi-handling
- * servlet.
+ * <b>standard input handling</b>: If your script accepts standard input, then the client must start sending input
+ * within a certain timeout period, otherwise the servlet will assume no input is coming and carry on running the
+ * script. The script's the standard input will be closed and handling of any further input from the client is
+ * undefined. Most likely it will be ignored. If this behavior becomes undesirable, then this servlet needs to be
+ * enhanced to handle threading of the spawned process' stdin, stdout, and stderr (which should not be too hard). <br>
+ * If you find your cgi scripts are timing out receiving input, you can set the init parameter
+ * <code>stderrTimeout</code> of your webapps' cgi-handling servlet.
  * </p>
  * <p>
- *
- * <b>Metavariable Values</b>: According to the CGI specification,
- * implementations may choose to represent both null or missing values in an
- * implementation-specific manner, but must define that manner.  This
- * implementation chooses to always define all required metavariables, but
- * set the value to "" for all metavariables whose value is either null or
- * undefined.  PATH_TRANSLATED is the sole exception to this rule, as per the
- * CGI Specification.
- *
+ * <b>Metavariable Values</b>: According to the CGI specification, implementations may choose to represent both null or
+ * missing values in an implementation-specific manner, but must define that manner. This implementation chooses to
+ * always define all required metavariables, but set the value to "" for all metavariables whose value is either null or
+ * undefined. PATH_TRANSLATED is the sole exception to this rule, as per the CGI Specification.
  * </p>
  * <p>
- *
- * <b>NPH --  Non-parsed-header implementation</b>:  This implementation does
- * not support the CGI NPH concept, whereby server ensures that the data
- * supplied to the script are precisely as supplied by the client and
- * unaltered by the server.
+ * <b>NPH -- Non-parsed-header implementation</b>: This implementation does not support the CGI NPH concept, whereby
+ * server ensures that the data supplied to the script are precisely as supplied by the client and unaltered by the
+ * server.
  * </p>
  * <p>
- * The function of a servlet container (including Tomcat) is specifically
- * designed to parse and possible alter CGI-specific variables, and as
- * such makes NPH functionality difficult to support.
+ * The function of a servlet container (including Tomcat) is specifically designed to parse and possible alter
+ * CGI-specific variables, and as such makes NPH functionality difficult to support.
  * </p>
  * <p>
- * The CGI specification states that compliant servers MAY support NPH output.
- * It does not state servers MUST support NPH output to be unconditionally
- * compliant.  Thus, this implementation maintains unconditional compliance
- * with the specification though NPH support is not present.
+ * The CGI specification states that compliant servers MAY support NPH output. It does not state servers MUST support
+ * NPH output to be unconditionally compliant. Thus, this implementation maintains unconditional compliance with the
+ * specification though NPH support is not present.
  * </p>
  * <p>
- *
- * The CGI specification is located at
- * <a href="http://cgi-spec.golux.com">http://cgi-spec.golux.com</a>.
- *
+ * The CGI specification is located at <a href="http://cgi-spec.golux.com">http://cgi-spec.golux.com</a>.
  * </p>
  * <h3>TODO:</h3>
  * <ul>
- * <li> Support for setting headers (for example, Location headers don't work)
- * <li> Support for collapsing multiple header lines (per RFC 2616)
- * <li> Ensure handling of POST method does not interfere with 2.3 Filters
- * <li> Refactor some debug code out of core
- * <li> Ensure header handling preserves encoding
- * <li> Possibly rewrite CGIRunner.run()?
- * <li> Possibly refactor CGIRunner and CGIEnvironment as non-inner classes?
- * <li> Document handling of cgi stdin when there is no stdin
- * <li> Revisit IOException handling in CGIRunner.run()
- * <li> Better documentation
- * <li> Confirm use of ServletInputStream.available() in CGIRunner.run() is
- *      not needed
- * <li> [add more to this TODO list]
+ * <li>Support for setting headers (for example, Location headers don't work)
+ * <li>Support for collapsing multiple header lines (per RFC 2616)
+ * <li>Ensure handling of POST method does not interfere with 2.3 Filters
+ * <li>Refactor some debug code out of core
+ * <li>Ensure header handling preserves encoding
+ * <li>Possibly rewrite CGIRunner.run()?
+ * <li>Possibly refactor CGIRunner and CGIEnvironment as non-inner classes?
+ * <li>Document handling of cgi stdin when there is no stdin
+ * <li>Revisit IOException handling in CGIRunner.run()
+ * <li>Better documentation
+ * <li>Confirm use of ServletInputStream.available() in CGIRunner.run() is not needed
+ * <li>[add more to this TODO list]
  * </ul>
  *
  * @author Martin T Dengler [root@martindengler.com]
@@ -264,10 +224,8 @@ public final class CGIServlet extends HttpServlet {
 
 
     /**
-     *  The CGI search path will start at
-     *    webAppRootDir + File.separator + cgiPathPrefix
-     *    (or webAppRootDir alone if cgiPathPrefix is
-     *    null)
+     * The CGI search path will start at webAppRootDir + File.separator + cgiPathPrefix (or webAppRootDir alone if
+     * cgiPathPrefix is null)
      */
     private String cgiPathPrefix = null;
 
@@ -278,8 +236,7 @@ public final class CGIServlet extends HttpServlet {
     private List<String> cgiExecutableArgs = null;
 
     /** the encoding to use for parameters */
-    private String parameterEncoding =
-        System.getProperty("file.encoding", "UTF-8");
+    private String parameterEncoding = System.getProperty("file.encoding", "UTF-8");
 
     /* The HTTP methods this Servlet will pass to the CGI script */
     private Set<String> cgiMethods = new HashSet<>();
@@ -287,20 +244,17 @@ public final class CGIServlet extends HttpServlet {
 
 
     /**
-     * The time (in milliseconds) to wait for the reading of stderr to complete
-     * before terminating the CGI process.
+     * The time (in milliseconds) to wait for the reading of stderr to complete before terminating the CGI process.
      */
     private long stderrTimeout = 2000;
 
     /**
-     * The regular expression used to select HTTP headers to be passed to the
-     * CGI process as environment variables. The name of the environment
-     * variable will be the name of the HTTP header converter to upper case,
-     * prefixed with <code>HTTP_</code> and with all <code>-</code> characters
-     * converted to <code>_</code>.
+     * The regular expression used to select HTTP headers to be passed to the CGI process as environment variables. The
+     * name of the environment variable will be the name of the HTTP header converter to upper case, prefixed with
+     * <code>HTTP_</code> and with all <code>-</code> characters converted to <code>_</code>.
      */
-    private Pattern envHttpHeadersPattern = Pattern.compile(
-            "ACCEPT[-0-9A-Z]*|CACHE-CONTROL|COOKIE|HOST|IF-[-0-9A-Z]*|REFERER|USER-AGENT");
+    private Pattern envHttpHeadersPattern =
+            Pattern.compile("ACCEPT[-0-9A-Z]*|CACHE-CONTROL|COOKIE|HOST|IF-[-0-9A-Z]*|REFERER|USER-AGENT");
 
     /** object used to ensure multiple threads don't try to expand same file */
     private static final Object expandFileLock = new Object();
@@ -309,44 +263,33 @@ public final class CGIServlet extends HttpServlet {
     private final Hashtable<String,String> shellEnv = new Hashtable<>();
 
     /**
-     * Enable creation of script command line arguments from query-string.
-     * See https://tools.ietf.org/html/rfc3875#section-4.4
-     * 4.4.  The Script Command Line
+     * Enable creation of script command line arguments from query-string. See
+     * https://tools.ietf.org/html/rfc3875#section-4.4 4.4. The Script Command Line
      */
     private boolean enableCmdLineArguments = false;
 
     /**
-     * Limits the encoded form of individual command line arguments. By default
-     * values are limited to those allowed by the RFC.
-     * See https://tools.ietf.org/html/rfc3875#section-4.4
-     *
-     * Uses \Q...\E to avoid individual quoting.
+     * Limits the encoded form of individual command line arguments. By default values are limited to those allowed by
+     * the RFC. See https://tools.ietf.org/html/rfc3875#section-4.4 Uses \Q...\E to avoid individual quoting.
      */
-    private Pattern cmdLineArgumentsEncodedPattern =
-            Pattern.compile("[\\w\\Q%;/?:@&,$-.!~*'()\\E]+");
+    private Pattern cmdLineArgumentsEncodedPattern = Pattern.compile("[\\w\\Q%;/?:@&,$-.!~*'()\\E]+");
 
     /**
-     * Limits the decoded form of individual command line arguments. Default
-     * varies by platform.
+     * Limits the decoded form of individual command line arguments. Default varies by platform.
      */
     private Pattern cmdLineArgumentsDecodedPattern = DEFAULT_CMD_LINE_ARGUMENTS_DECODED_PATTERN;
 
 
-
     /**
      * Sets instance variables.
      * <P>
      * Modified from Craig R. McClanahan's InvokerServlet
      * </P>
      *
-     * @param config                    a <code>ServletConfig</code> object
-     *                                  containing the servlet's
-     *                                  configuration and initialization
-     *                                  parameters
+     * @param config a <code>ServletConfig</code> object containing the servlet's configuration and initialization
+     *                   parameters
      *
-     * @exception ServletException      if an exception has occurred that
-     *                                  interferes with the servlet's normal
-     *                                  operation
+     * @exception ServletException if an exception has occurred that interferes with the servlet's normal operation
      */
     @Override
     public void init(ServletConfig config) throws ServletException {
@@ -356,14 +299,14 @@ public final class CGIServlet extends HttpServlet {
         // Set our properties from the initialization parameters
         cgiPathPrefix = getServletConfig().getInitParameter("cgiPathPrefix");
         boolean passShellEnvironment =
-            Boolean.parseBoolean(getServletConfig().getInitParameter("passShellEnvironment"));
+                Boolean.parseBoolean(getServletConfig().getInitParameter("passShellEnvironment"));
 
         if (passShellEnvironment) {
             shellEnv.putAll(System.getenv());
         }
 
         Enumeration<String> e = config.getInitParameterNames();
-        while(e.hasMoreElements()) {
+        while (e.hasMoreElements()) {
             String initParamName = e.nextElement();
             if (initParamName.startsWith("environment-variable-")) {
                 if (initParamName.length() == 21) {
@@ -380,8 +323,7 @@ public final class CGIServlet extends HttpServlet {
         if (getServletConfig().getInitParameter("executable-arg-1") != null) {
             List<String> args = new ArrayList<>();
             for (int i = 1;; i++) {
-                String arg = getServletConfig().getInitParameter(
-                        "executable-arg-" + i);
+                String arg = getServletConfig().getInitParameter("executable-arg-" + i);
                 if (arg == null) {
                     break;
                 }
@@ -395,18 +337,15 @@ public final class CGIServlet extends HttpServlet {
         }
 
         if (getServletConfig().getInitParameter("stderrTimeout") != null) {
-            stderrTimeout = Long.parseLong(getServletConfig().getInitParameter(
-                    "stderrTimeout"));
+            stderrTimeout = Long.parseLong(getServletConfig().getInitParameter("stderrTimeout"));
         }
 
         if (getServletConfig().getInitParameter("envHttpHeaders") != null) {
-            envHttpHeadersPattern =
-                    Pattern.compile(getServletConfig().getInitParameter("envHttpHeaders"));
+            envHttpHeadersPattern = Pattern.compile(getServletConfig().getInitParameter("envHttpHeaders"));
         }
 
         if (getServletConfig().getInitParameter("enableCmdLineArguments") != null) {
-            enableCmdLineArguments =
-                    Boolean.parseBoolean(config.getInitParameter("enableCmdLineArguments"));
+            enableCmdLineArguments = Boolean.parseBoolean(config.getInitParameter("enableCmdLineArguments"));
         }
 
         if (getServletConfig().getInitParameter("cgiMethods") != null) {
@@ -443,14 +382,13 @@ public final class CGIServlet extends HttpServlet {
 
     /**
      * Logs important Servlet API and container information.
-     *
      * <p>
      * Based on SnoopAllServlet by Craig R. McClanahan
      * </p>
      *
-     * @param  req    HttpServletRequest object used as source of information
+     * @param req HttpServletRequest object used as source of information
      *
-     * @exception  IOException  if a write operation exception occurs
+     * @exception IOException if a write operation exception occurs
      */
     private void printServletEnvironment(HttpServletRequest req) throws IOException {
 
@@ -459,7 +397,7 @@ public final class CGIServlet extends HttpServlet {
         Enumeration<String> attrs = req.getAttributeNames();
         while (attrs.hasMoreElements()) {
             String attr = attrs.nextElement();
-            log.trace("Request Attribute: " + attr + ": [ " + req.getAttribute(attr) +"]");
+            log.trace("Request Attribute: " + attr + ": [ " + req.getAttribute(attr) + "]");
         }
         log.trace("Character Encoding: [" + req.getCharacterEncoding() + "]");
         log.trace("Content Length: [" + req.getContentLengthLong() + "]");
@@ -467,7 +405,7 @@ public final class CGIServlet extends HttpServlet {
         Enumeration<Locale> locales = req.getLocales();
         while (locales.hasMoreElements()) {
             Locale locale = locales.nextElement();
-            log.trace("Locale: [" +locale + "]");
+            log.trace("Locale: [" + locale + "]");
         }
         Enumeration<String> params = req.getParameterNames();
         while (params.hasMoreElements()) {
@@ -505,8 +443,7 @@ public final class CGIServlet extends HttpServlet {
         log.trace("Query String: [" + req.getQueryString() + "]");
         log.trace("Remote User: [" + req.getRemoteUser() + "]");
         log.trace("Requested Session ID: [" + req.getRequestedSessionId() + "]");
-        log.trace("Requested Session ID From Cookie: [" +
-                req.isRequestedSessionIdFromCookie() + "]");
+        log.trace("Requested Session ID From Cookie: [" + req.isRequestedSessionIdFromCookie() + "]");
         log.trace("Requested Session ID From URL: [" + req.isRequestedSessionIdFromURL() + "]");
         log.trace("Requested Session ID Valid: [" + req.isRequestedSessionIdValid() + "]");
         log.trace("Request URI: [" + req.getRequestURI() + "]");
@@ -565,20 +502,18 @@ public final class CGIServlet extends HttpServlet {
         attrs = getServletContext().getAttributeNames();
         while (attrs.hasMoreElements()) {
             String attr = attrs.nextElement();
-            log.trace("Servlet Context Attribute: " + attr +
-                    ": [" + getServletContext().getAttribute(attr) + "]");
+            log.trace("Servlet Context Attribute: " + attr + ": [" + getServletContext().getAttribute(attr) + "]");
         }
     }
 
 
     @Override
-    protected void service(HttpServletRequest req, HttpServletResponse res)
-            throws ServletException, IOException {
+    protected void service(HttpServletRequest req, HttpServletResponse res) throws ServletException, IOException {
 
         String method = req.getMethod();
         if (cgiMethodsAll || cgiMethods.contains(method)) {
             doGet(req, res);
-        } else if (DEFAULT_SUPER_METHODS.contains(method)){
+        } else if (DEFAULT_SUPER_METHODS.contains(method)) {
             // If the CGI servlet is explicitly configured to handle one of
             // these methods it will be handled in the previous condition
             super.service(req, res);
@@ -592,23 +527,20 @@ public final class CGIServlet extends HttpServlet {
     /**
      * Provides CGI Gateway service.
      *
-     * @param  req   HttpServletRequest passed in by servlet container
-     * @param  res   HttpServletResponse passed in by servlet container
+     * @param req HttpServletRequest passed in by servlet container
+     * @param res HttpServletResponse passed in by servlet container
      *
-     * @exception  ServletException  if a servlet-specific exception occurs
-     * @exception  IOException  if a read/write exception occurs
+     * @exception ServletException if a servlet-specific exception occurs
+     * @exception IOException      if a read/write exception occurs
      */
     @Override
-    protected void doGet(HttpServletRequest req, HttpServletResponse res)
-            throws ServletException, IOException {
+    protected void doGet(HttpServletRequest req, HttpServletResponse res) throws ServletException, IOException {
 
         CGIEnvironment cgiEnv = new CGIEnvironment(req, getServletContext());
 
         if (cgiEnv.isValid()) {
-            CGIRunner cgi = new CGIRunner(cgiEnv.getCommand(),
-                                          cgiEnv.getEnvironment(),
-                                          cgiEnv.getWorkingDirectory(),
-                                          cgiEnv.getParameters());
+            CGIRunner cgi = new CGIRunner(cgiEnv.getCommand(), cgiEnv.getEnvironment(), cgiEnv.getWorkingDirectory(),
+                    cgiEnv.getParameters());
 
             if ("POST".equals(req.getMethod())) {
                 cgi.setInput(req.getInputStream());
@@ -631,10 +563,9 @@ public final class CGIServlet extends HttpServlet {
 
 
     @Override
-    protected void doOptions(HttpServletRequest req, HttpServletResponse res)
-            throws ServletException, IOException {
+    protected void doOptions(HttpServletRequest req, HttpServletResponse res) throws ServletException, IOException {
         // Note: This method will never be called if cgiMethods is "*" so that
-        //       case does nto need to be handled here.
+        // case does nto need to be handled here.
         Set<String> allowedMethods = new HashSet<>();
         allowedMethods.addAll(cgiMethods);
         allowedMethods.addAll(DEFAULT_SUPER_METHODS);
@@ -656,11 +587,10 @@ public final class CGIServlet extends HttpServlet {
     /*
      * Behaviour depends on the status code.
      *
-     * Status < 400  - Calls setStatus. Returns false. CGI servlet will provide
-     *                 the response body.
+     * Status < 400 - Calls setStatus. Returns false. CGI servlet will provide the response body.
      *
-     * Status >= 400 - Calls sendError(status), returns true. Standard error
-     *                 page mechanism will provide the response body.
+     * Status >= 400 - Calls sendError(status), returns true. Standard error page mechanism will provide the response
+     * body.
      */
     private boolean setStatus(HttpServletResponse response, int status) throws IOException {
         if (status >= HttpServletResponse.SC_BAD_REQUEST) {
@@ -674,8 +604,8 @@ public final class CGIServlet extends HttpServlet {
 
 
     /**
-     * Encapsulates the CGI environment and rules to derive
-     * that environment from the servlet container and request information.
+     * Encapsulates the CGI environment and rules to derive that environment from the servlet container and request
+     * information.
      */
     protected class CGIEnvironment {
 
@@ -699,7 +629,7 @@ public final class CGIServlet extends HttpServlet {
         private File tmpDir = null;
 
         /** derived cgi environment */
-        private Hashtable<String, String> env = null;
+        private Hashtable<String,String> env = null;
 
         /** cgi command to be invoked */
         private String command = null;
@@ -715,17 +645,15 @@ public final class CGIServlet extends HttpServlet {
 
 
         /**
-         * Creates a CGIEnvironment and derives the necessary environment,
-         * query parameters, working directory, cgi command, etc.
+         * Creates a CGIEnvironment and derives the necessary environment, query parameters, working directory, cgi
+         * command, etc.
+         *
+         * @param req     HttpServletRequest for information provided by the Servlet API
+         * @param context ServletContext for information provided by the Servlet API
          *
-         * @param  req       HttpServletRequest for information provided by
-         *                   the Servlet API
-         * @param  context   ServletContext for information provided by the
-         *                   Servlet API
          * @throws IOException an IO error occurred
          */
-        protected CGIEnvironment(HttpServletRequest req,
-                                 ServletContext context) throws IOException {
+        protected CGIEnvironment(HttpServletRequest req, ServletContext context) throws IOException {
             setupFromContext(context);
             boolean valid = setupFromRequest(req);
 
@@ -734,8 +662,7 @@ public final class CGIServlet extends HttpServlet {
             }
 
             if (valid) {
-                workingDirectory = new File(command.substring(0,
-                      command.lastIndexOf(File.separator)));
+                workingDirectory = new File(command.substring(0, command.lastIndexOf(File.separator)));
             } else {
                 workingDirectory = null;
             }
@@ -747,8 +674,7 @@ public final class CGIServlet extends HttpServlet {
         /**
          * Uses the ServletContext to set some CGI variables
          *
-         * @param  context   ServletContext for information provided by the
-         *                   Servlet API
+         * @param context ServletContext for information provided by the Servlet API
          */
         protected void setupFromContext(ServletContext context) {
             this.context = context;
@@ -760,31 +686,24 @@ public final class CGIServlet extends HttpServlet {
         /**
          * Uses the HttpServletRequest to set most CGI variables
          *
-         * @param  req   HttpServletRequest for information provided by
-         *               the Servlet API
+         * @param req HttpServletRequest for information provided by the Servlet API
          *
-         * @return true if the request was parsed without error, false if there
-         *           was a problem
+         * @return true if the request was parsed without error, false if there was a problem
          *
          * @throws UnsupportedEncodingException Unknown encoding
          */
-        protected boolean setupFromRequest(HttpServletRequest req)
-                throws UnsupportedEncodingException {
+        protected boolean setupFromRequest(HttpServletRequest req) throws UnsupportedEncodingException {
 
             boolean isIncluded = false;
 
             // Look to see if this request is an include
-            if (req.getAttribute(
-                    RequestDispatcher.INCLUDE_REQUEST_URI) != null) {
+            if (req.getAttribute(RequestDispatcher.INCLUDE_REQUEST_URI) != null) {
                 isIncluded = true;
             }
             if (isIncluded) {
-                this.contextPath = (String) req.getAttribute(
-                        RequestDispatcher.INCLUDE_CONTEXT_PATH);
-                this.servletPath = (String) req.getAttribute(
-                        RequestDispatcher.INCLUDE_SERVLET_PATH);
-                this.pathInfo = (String) req.getAttribute(
-                        RequestDispatcher.INCLUDE_PATH_INFO);
+                this.contextPath = (String) req.getAttribute(RequestDispatcher.INCLUDE_CONTEXT_PATH);
+                this.servletPath = (String) req.getAttribute(RequestDispatcher.INCLUDE_SERVLET_PATH);
+                this.pathInfo = (String) req.getAttribute(RequestDispatcher.INCLUDE_PATH_INFO);
             } else {
                 this.contextPath = req.getContextPath();
                 this.servletPath = req.getServletPath();
@@ -804,8 +723,7 @@ public final class CGIServlet extends HttpServlet {
                     req.getMethod().equals("HEAD"))) {
                 String qs;
                 if (isIncluded) {
-                    qs = (String) req.getAttribute(
-                            RequestDispatcher.INCLUDE_QUERY_STRING);
+                    qs = (String) req.getAttribute(RequestDispatcher.INCLUDE_QUERY_STRING);
                 } else {
                     qs = req.getQueryString();
                 }
@@ -815,8 +733,8 @@ public final class CGIServlet extends HttpServlet {
                         String encodedArgument = qsTokens.nextToken();
                         if (!cmdLineArgumentsEncodedPattern.matcher(encodedArgument).matches()) {
                             if (log.isDebugEnabled()) {
-                                log.debug(sm.getString("cgiServlet.invalidArgumentEncoded",
-                                        encodedArgument, cmdLineArgumentsEncodedPattern.toString()));
+                                log.debug(sm.getString("cgiServlet.invalidArgumentEncoded", encodedArgument,
+                                        cmdLineArgumentsEncodedPattern.toString()));
                             }
                             return false;
                         }
@@ -825,8 +743,8 @@ public final class CGIServlet extends HttpServlet {
                         if (cmdLineArgumentsDecodedPattern != null &&
                                 !cmdLineArgumentsDecodedPattern.matcher(decodedArgument).matches()) {
                             if (log.isDebugEnabled()) {
-                                log.debug(sm.getString("cgiServlet.invalidArgumentDecoded",
-                                        decodedArgument, cmdLineArgumentsDecodedPattern.toString()));
+                                log.debug(sm.getString("cgiServlet.invalidArgumentDecoded", decodedArgument,
+                                        cmdLineArgumentsDecodedPattern.toString()));
                             }
                             return false;
                         }
@@ -842,11 +760,13 @@ public final class CGIServlet extends HttpServlet {
 
         /**
          * Resolves core information about the cgi script.
-         *
          * <p>
          * Example URI:
          * </p>
-         * <PRE> /servlet/cgigateway/dir1/realCGIscript/pathinfo1 </PRE>
+         *
+         * <PRE>
+         *  /servlet/cgigateway/dir1/realCGIscript/pathinfo1
+         * </PRE>
          * <ul>
          * <LI><b>path</b> = $CATALINA_HOME/mywebapp/dir1/realCGIscript
          * <LI><b>scriptName</b> = /servlet/cgigateway/dir1/realCGIscript
@@ -854,64 +774,45 @@ public final class CGIServlet extends HttpServlet {
          * <LI><b>name</b> = realCGIscript
          * </ul>
          * <p>
-         * CGI search algorithm: search the real path below
-         *    &lt;my-webapp-root&gt; and find the first non-directory in
-         *    the getPathTranslated("/"), reading/searching from left-to-right.
+         * CGI search algorithm: search the real path below &lt;my-webapp-root&gt; and find the first non-directory in
+         * the getPathTranslated("/"), reading/searching from left-to-right.
          * </p>
          * <p>
-         *   The CGI search path will start at
-         *   webAppRootDir + File.separator + cgiPathPrefix
-         *   (or webAppRootDir alone if cgiPathPrefix is
-         *   null).
+         * The CGI search path will start at webAppRootDir + File.separator + cgiPathPrefix (or webAppRootDir alone if
+         * cgiPathPrefix is null).
          * </p>
          * <p>
-         *   cgiPathPrefix is defined by setting
-         *   this servlet's cgiPathPrefix init parameter
-         *
+         * cgiPathPrefix is defined by setting this servlet's cgiPathPrefix init parameter
          * </p>
          *
-         * @param pathInfo       String from HttpServletRequest.getPathInfo()
-         * @param webAppRootDir  String from context.getRealPath("/")
-         * @param contextPath    String as from
-         *                       HttpServletRequest.getContextPath()
-         * @param servletPath    String as from
-         *                       HttpServletRequest.getServletPath()
-         * @param cgiPathPrefix  subdirectory of webAppRootDir below which
-         *                       the web app's CGIs may be stored; can be null.
-         *                       The CGI search path will start at
-         *                       webAppRootDir + File.separator + cgiPathPrefix
-         *                       (or webAppRootDir alone if cgiPathPrefix is
-         *                       null).  cgiPathPrefix is defined by setting
-         *                       the servlet's cgiPathPrefix init parameter.
-         *
+         * @param pathInfo      String from HttpServletRequest.getPathInfo()
+         * @param webAppRootDir String from context.getRealPath("/")
+         * @param contextPath   String as from HttpServletRequest.getContextPath()
+         * @param servletPath   String as from HttpServletRequest.getServletPath()
+         * @param cgiPathPrefix subdirectory of webAppRootDir below which the web app's CGIs may be stored; can be null.
+         *                          The CGI search path will start at webAppRootDir + File.separator + cgiPathPrefix (or
+         *                          webAppRootDir alone if cgiPathPrefix is null). cgiPathPrefix is defined by setting
+         *                          the servlet's cgiPathPrefix init parameter.
          *
          * @return
-         * <ul>
-         * <li>
-         * <code>path</code> -    full file-system path to valid cgi script,
-         *                        or null if no cgi was found
-         * <li>
-         * <code>scriptName</code> -
-         *                        CGI variable SCRIPT_NAME; the full URL path
-         *                        to valid cgi script or null if no cgi was
-         *                        found
-         * <li>
-         * <code>cgiName</code> - servlet pathInfo fragment corresponding to
-         *                        the cgi script itself, or null if not found
-         * <li>
-         * <code>name</code> -    simple name (no directories) of the
-         *                        cgi script, or null if no cgi was found
-         * </ul>
+         *             <ul>
+         *             <li><code>path</code> - full file-system path to valid cgi script, or null if no cgi was found
+         *             <li><code>scriptName</code> - CGI variable SCRIPT_NAME; the full URL path to valid cgi script or
+         *             null if no cgi was found
+         *             <li><code>cgiName</code> - servlet pathInfo fragment corresponding to the cgi script itself, or
+         *             null if not found
+         *             <li><code>name</code> - simple name (no directories) of the cgi script, or null if no cgi was
+         *             found
+         *             </ul>
          */
-        protected String[] findCGI(String pathInfo, String webAppRootDir,
-                                   String contextPath, String servletPath,
-                                   String cgiPathPrefix) {
+        protected String[] findCGI(String pathInfo, String webAppRootDir, String contextPath, String servletPath,
+                String cgiPathPrefix) {
             String path = null;
             String name = null;
             String scriptname = null;
 
             if (webAppRootDir.lastIndexOf(File.separator) == (webAppRootDir.length() - 1)) {
-                //strip the trailing "/" from the webAppRootDir
+                // strip the trailing "/" from the webAppRootDir
                 webAppRootDir = webAppRootDir.substring(0, (webAppRootDir.length() - 1));
             }
 
@@ -926,8 +827,7 @@ public final class CGIServlet extends HttpServlet {
             File currentLocation = new File(webAppRootDir);
             StringTokenizer dirWalker = new StringTokenizer(pathInfo, "/");
             if (log.isDebugEnabled()) {
-                log.debug(sm.getString("cgiServlet.find.location",
-                        currentLocation.getAbsolutePath()));
+                log.debug(sm.getString("cgiServlet.find.location", currentLocation.getAbsolutePath()));
             }
             StringBuilder cginameBuilder = new StringBuilder();
             while (!currentLocation.isFile() && dirWalker.hasMoreElements()) {
@@ -935,8 +835,7 @@ public final class CGIServlet extends HttpServlet {
                 currentLocation = new File(currentLocation, nextElement);
                 cginameBuilder.append('/').append(nextElement);
                 if (log.isDebugEnabled()) {
-                    log.debug(sm.getString("cgiServlet.find.location",
-                            currentLocation.getAbsolutePath()));
+                    log.debug(sm.getString("cgiServlet.find.location", currentLocation.getAbsolutePath()));
                 }
             }
             String cginame = cginameBuilder.toString();
@@ -960,26 +859,24 @@ public final class CGIServlet extends HttpServlet {
         }
 
         /**
-         * Constructs the CGI environment to be supplied to the invoked CGI
-         * script; relies heavily on Servlet API methods and findCGI
+         * Constructs the CGI environment to be supplied to the invoked CGI script; relies heavily on Servlet API
+         * methods and findCGI
+         *
+         * @param req request associated with the CGI Invocation
          *
-         * @param    req request associated with the CGI
-         *           Invocation
+         * @return true if environment was set OK, false if there was a problem and no environment was set
          *
-         * @return   true if environment was set OK, false if there
-         *           was a problem and no environment was set
          * @throws IOException an IO error occurred
          */
         protected boolean setCGIEnvironment(HttpServletRequest req) throws IOException {
 
             /*
              * This method is slightly ugly; c'est la vie.
-             * "You cannot stop [ugliness], you can only hope to contain [it]"
-             * (apologies to Marv Albert regarding MJ)
+             * "You cannot stop [ugliness], you can only hope to contain [it]" (apologies to Marv Albert regarding MJ)
              */
 
             // Add the shell environment variables (if any)
-            Hashtable<String, String> envp = new Hashtable<>(shellEnv);
+            Hashtable<String,String> envp = new Hashtable<>(shellEnv);
 
             // Add the CGI environment variables
             String sPathInfoOrig = null;
@@ -995,17 +892,13 @@ public final class CGIServlet extends HttpServlet {
             sPathInfoOrig = this.pathInfo;
             sPathInfoOrig = sPathInfoOrig == null ? "" : sPathInfoOrig;
 
-            if (webAppRootDir == null ) {
+            if (webAppRootDir == null) {
                 // The app has not been deployed in exploded form
                 webAppRootDir = tmpDir.toString();
                 expandCGIScript();
             }
 
-            sCGINames = findCGI(sPathInfoOrig,
-                                webAppRootDir,
-                                contextPath,
-                                servletPath,
-                                cgiPathPrefix);
+            sCGINames = findCGI(sPathInfoOrig, webAppRootDir, contextPath, servletPath, cgiPathPrefix);
 
             sCGIFullPath = sCGINames[0];
             sCGIScriptName = sCGINames[1];
@@ -1025,8 +918,7 @@ public final class CGIServlet extends HttpServlet {
             envp.put("SERVER_PROTOCOL", nullsToBlanks(req.getProtocol()));
 
             int port = req.getServerPort();
-            Integer iPort =
-                (port == 0 ? Integer.valueOf(-1) : Integer.valueOf(port));
+            Integer iPort = (port == 0 ? Integer.valueOf(-1) : Integer.valueOf(port));
             envp.put("SERVER_PORT", iPort.toString());
 
             envp.put("REQUEST_METHOD", nullsToBlanks(req.getMethod()));
@@ -1076,7 +968,7 @@ public final class CGIServlet extends HttpServlet {
                 sPathTranslatedCGI = context.getRealPath(sPathInfoCGI);
             }
             if (sPathTranslatedCGI == null || "".equals(sPathTranslatedCGI)) {
-                //NOOP
+                // NOOP
             } else {
                 envp.put("PATH_TRANSLATED", nullsToBlanks(sPathTranslatedCGI));
             }
@@ -1094,18 +986,17 @@ public final class CGIServlet extends HttpServlet {
 
             envp.put("REMOTE_USER", nullsToBlanks(req.getRemoteUser()));
 
-            envp.put("REMOTE_IDENT", ""); //not necessary for full compliance
+            envp.put("REMOTE_IDENT", ""); // not necessary for full compliance
 
             envp.put("CONTENT_TYPE", nullsToBlanks(req.getContentType()));
 
 
-            /* Note CGI spec says CONTENT_LENGTH must be NULL ("") or undefined
-             * if there is no content, so we cannot put 0 or -1 in as per the
-             * Servlet API spec.
+            /*
+             * Note CGI spec says CONTENT_LENGTH must be NULL ("") or undefined if there is no content, so we cannot put
+             * 0 or -1 in as per the Servlet API spec.
              */
             long contentLength = req.getContentLengthLong();
-            String sContentLength = (contentLength <= 0 ? "" :
-                Long.toString(contentLength));
+            String sContentLength = (contentLength <= 0 ? "" : Long.toString(contentLength));
             envp.put("CONTENT_LENGTH", sContentLength);
 
 
@@ -1114,9 +1005,9 @@ public final class CGIServlet extends HttpServlet {
             while (headers.hasMoreElements()) {
                 header = null;
                 header = headers.nextElement().toUpperCase(Locale.ENGLISH);
-                //REMIND: rewrite multiple headers as if received as single
-                //REMIND: change character set
-                //REMIND: I forgot what the previous REMIND means
+                // REMIND: rewrite multiple headers as if received as single
+                // REMIND: change character set
+                // REMIND: I forgot what the previous REMIND means
                 if (envHttpHeadersPattern.matcher(header).matches()) {
                     envp.put("HTTP_" + header.replace('-', '_'), req.getHeader(header));
                 }
@@ -1125,9 +1016,9 @@ public final class CGIServlet extends HttpServlet {
             File fCGIFullPath = new File(sCGIFullPath);
             command = fCGIFullPath.getCanonicalPath();
 
-            envp.put("X_TOMCAT_SCRIPT_PATH", command);  //for kicks
+            envp.put("X_TOMCAT_SCRIPT_PATH", command); // for kicks
 
-            envp.put("SCRIPT_FILENAME", command);  //for PHP
+            envp.put("SCRIPT_FILENAME", command); // for PHP
 
             this.env = envp;
 
@@ -1135,8 +1026,8 @@ public final class CGIServlet extends HttpServlet {
         }
 
         /**
-         * Extracts requested resource from web app archive to context work
-         * directory to enable CGI script to be executed.
+         * Extracts requested resource from web app archive to context work directory to enable CGI script to be
+         * executed.
          */
         protected void expandCGIScript() {
             StringBuilder srcPath = new StringBuilder();
@@ -1144,7 +1035,7 @@ public final class CGIServlet extends HttpServlet {
             InputStream is = null;
 
             // paths depend on mapping
-            if (cgiPathPrefix == null ) {
+            if (cgiPathPrefix == null) {
                 srcPath.append(pathInfo);
                 is = context.getResourceAsStream(srcPath.toString());
                 destPath.append(tmpDir);
@@ -1152,8 +1043,7 @@ public final class CGIServlet extends HttpServlet {
             } else {
                 // essentially same search algorithm as findCGI()
                 srcPath.append(cgiPathPrefix);
-                StringTokenizer pathWalker =
-                        new StringTokenizer (pathInfo, "/");
+                StringTokenizer pathWalker = new StringTokenizer(pathInfo, "/");
                 // start with first element
                 while (pathWalker.hasMoreElements() && (is == null)) {
                     srcPath.append('/');
@@ -1223,8 +1113,7 @@ public final class CGIServlet extends HttpServlet {
 
 
         /**
-         * Returns important CGI environment information in a multi-line text
-         * format.
+         * Returns important CGI environment information in a multi-line text format.
          *
          * @return CGI environment info
          */
@@ -1292,8 +1181,7 @@ public final class CGIServlet extends HttpServlet {
         /**
          * Gets derived command string
          *
-         * @return  command string
-         *
+         * @return command string
          */
         protected String getCommand() {
             return command;
@@ -1303,8 +1191,7 @@ public final class CGIServlet extends HttpServlet {
         /**
          * Gets derived CGI working directory
          *
-         * @return  working directory
-         *
+         * @return working directory
          */
         protected File getWorkingDirectory() {
             return workingDirectory;
@@ -1314,8 +1201,7 @@ public final class CGIServlet extends HttpServlet {
         /**
          * Gets derived CGI environment
          *
-         * @return   CGI environment
-         *
+         * @return CGI environment
          */
         protected Hashtable<String,String> getEnvironment() {
             return env;
@@ -1325,8 +1211,7 @@ public final class CGIServlet extends HttpServlet {
         /**
          * Gets derived CGI query parameters
          *
-         * @return   CGI query parameters
-         *
+         * @return CGI query parameters
          */
         protected ArrayList<String> getParameters() {
             return cmdLineParameters;
@@ -1336,9 +1221,7 @@ public final class CGIServlet extends HttpServlet {
         /**
          * Gets validity status
          *
-         * @return   true if this environment is valid, false
-         *           otherwise
-         *
+         * @return true if this environment is valid, false otherwise
          */
         protected boolean isValid() {
             return valid;
@@ -1348,9 +1231,9 @@ public final class CGIServlet extends HttpServlet {
         /**
          * Converts null strings to blank strings ("")
          *
-         * @param    s string to be converted if necessary
-         * @return   a non-null string, either the original or the empty string
-         *           ("") if the original was <code>null</code>
+         * @param s string to be converted if necessary
+         *
+         * @return a non-null string, either the original or the empty string ("") if the original was <code>null</code>
          */
         protected String nullsToBlanks(String s) {
             return nullsToString(s, "");
@@ -1360,13 +1243,12 @@ public final class CGIServlet extends HttpServlet {
         /**
          * Converts null strings to another string
          *
-         * @param    couldBeNull string to be converted if necessary
-         * @param    subForNulls string to return instead of a null string
-         * @return   a non-null string, either the original or the substitute
-         *           string if the original was <code>null</code>
+         * @param couldBeNull string to be converted if necessary
+         * @param subForNulls string to return instead of a null string
+         *
+         * @return a non-null string, either the original or the substitute string if the original was <code>null</code>
          */
-        protected String nullsToString(String couldBeNull,
-                                       String subForNulls) {
+        protected String nullsToString(String couldBeNull, String subForNulls) {
             return (couldBeNull == null ? subForNulls : couldBeNull);
         }
 
@@ -1374,40 +1256,32 @@ public final class CGIServlet extends HttpServlet {
         /**
          * Converts blank strings to another string
          *
-         * @param    couldBeBlank string to be converted if necessary
-         * @param    subForBlanks string to return instead of a blank string
-         * @return   a non-null string, either the original or the substitute
-         *           string if the original was <code>null</code> or empty ("")
+         * @param couldBeBlank string to be converted if necessary
+         * @param subForBlanks string to return instead of a blank string
+         *
+         * @return a non-null string, either the original or the substitute string if the original was <code>null</code>
+         *             or empty ("")
          */
-        protected String blanksToString(String couldBeBlank,
-                                      String subForBlanks) {
+        protected String blanksToString(String couldBeBlank, String subForBlanks) {
             return (couldBeBlank == null || couldBeBlank.isEmpty()) ? subForBlanks : couldBeBlank;
         }
 
 
-    } //class CGIEnvironment
+    } // class CGIEnvironment
 
 
     /**
-     * Encapsulates the knowledge of how to run a CGI script, given the
-     * script's desired environment and (optionally) input/output streams
-     *
+     * Encapsulates the knowledge of how to run a CGI script, given the script's desired environment and (optionally)
+     * input/output streams
      * <p>
-     *
-     * Exposes a <code>run</code> method used to actually invoke the
-     * CGI.
-     *
+     * Exposes a <code>run</code> method used to actually invoke the CGI.
      * </p>
      * <p>
-     *
-     * The CGI environment and settings are derived from the information
-     * passed to the constructor.
-     *
+     * The CGI environment and settings are derived from the information passed to the constructor.
      * </p>
      * <p>
-     *
-     * The input and output streams can be set by the <code>setInput</code>
-     * and <code>setResponse</code> methods, respectively.
+     * The input and output streams can be set by the <code>setInput</code> and <code>setResponse</code> methods,
+     * respectively.
      * </p>
      */
     protected class CGIRunner {
@@ -1435,21 +1309,16 @@ public final class CGIServlet extends HttpServlet {
 
 
         /**
-         *  Creates a CGIRunner and initializes its environment, working
-         *  directory, and query parameters.
-         *  <BR>
-         *  Input/output streams (optional) are set using the
-         *  <code>setInput</code> and <code>setResponse</code> methods,
-         *  respectively.
+         * Creates a CGIRunner and initializes its environment, working directory, and query parameters. <BR>
+         * Input/output streams (optional) are set using the <code>setInput</code> and <code>setResponse</code> methods,
+         * respectively.
          *
-         * @param  command  string full path to command to be executed
-         * @param  env      Hashtable with the desired script environment
-         * @param  wd       File with the script's desired working directory
-         * @param  params   ArrayList with the script's query command line
-         *                  parameters as strings
+         * @param command string full path to command to be executed
+         * @param env     Hashtable with the desired script environment
+         * @param wd      File with the script's desired working directory
+         * @param params  ArrayList with the script's query command line parameters as strings
          */
-        protected CGIRunner(String command, Hashtable<String,String> env,
-                            File wd, ArrayList<String> params) {
+        protected CGIRunner(String command, Hashtable<String,String> env, File wd, ArrayList<String> params) {
             this.command = command;
             this.env = env;
             this.wd = wd;
@@ -1473,8 +1342,7 @@ public final class CGIServlet extends HttpServlet {
         /**
          * Gets ready status
          *
-         * @return   false if not ready (<code>run</code> will throw
-         *           an exception), true if ready
+         * @return false if not ready (<code>run</code> will throw an exception), true if ready
          */
         protected boolean isReady() {
             return readyToRun;
@@ -1482,11 +1350,9 @@ public final class CGIServlet extends HttpServlet {
 
 
         /**
-         * Sets HttpServletResponse object used to set headers and send
-         * output to
-         *
-         * @param  response   HttpServletResponse to be used
+         * Sets HttpServletResponse object used to set headers and send output to
          *
+         * @param response HttpServletResponse to be used
          */
         protected void setResponse(HttpServletResponse response) {
             this.response = response;
@@ -1497,8 +1363,7 @@ public final class CGIServlet extends HttpServlet {
         /**
          * Sets standard input to be passed on to the invoked cgi script
          *
-         * @param  stdin   InputStream to be used
-         *
+         * @param stdin InputStream to be used
          */
         protected void setInput(InputStream stdin) {
             this.stdin = stdin;
@@ -1507,19 +1372,16 @@ public final class CGIServlet extends HttpServlet {
 
 
         /**
-         * Converts a Hashtable to a String array by converting each
-         * key/value pair in the Hashtable to a String in the form
-         * "key=value" (hashkey + "=" + hash.get(hashkey).toString())
+         * Converts a Hashtable to a String array by converting each key/value pair in the Hashtable to a String in the
+         * form "key=value" (hashkey + "=" + hash.get(hashkey).toString())
          *
-         * @param  h   Hashtable to convert
+         * @param h Hashtable to convert
          *
-         * @return     converted string array
-         *
-         * @exception  NullPointerException   if a hash key has a null value
+         * @return converted string array
          *
+         * @exception NullPointerException if a hash key has a null value
          */
-        protected String[] hashToStringArray(Hashtable<String,?> h)
-            throws NullPointerException {
+        protected String[] hashToStringArray(Hashtable<String,?> h) throws NullPointerException {
             List<String> list = new ArrayList<>(h.size());
             Enumeration<String> e = h.keys();
             while (e.hasMoreElements()) {
@@ -1531,61 +1393,44 @@ public final class CGIServlet extends HttpServlet {
 
 
         /**
-         * Executes a CGI script with the desired environment, current working
-         * directory, and input/output streams
-         *
+         * Executes a CGI script with the desired environment, current working directory, and input/output streams
          * <p>
          * This implements the following CGI specification recommendations:
          * </p>
          * <UL>
-         * <LI> Servers SHOULD provide the "<code>query</code>" component of
-         *      the script-URI as command-line arguments to scripts if it
-         *      does not contain any unencoded "=" characters and the
-         *      command-line arguments can be generated in an unambiguous
-         *      manner.
-         * <LI> Servers SHOULD set the AUTH_TYPE metavariable to the value
-         *      of the "<code>auth-scheme</code>" token of the
-         *      "<code>Authorization</code>" if it was supplied as part of the
-         *      request header.  See <code>getCGIEnvironment</code> method.
-         * <LI> Where applicable, servers SHOULD set the current working
-         *      directory to the directory in which the script is located
-         *      before invoking it.
-         * <LI> Server implementations SHOULD define their behavior for the
-         *      following cases:
-         *     <ul>
-         *     <LI> <u>Allowed characters in pathInfo</u>:  This implementation
-         *             does not allow ASCII NUL nor any character which cannot
-         *             be URL-encoded according to internet standards;
-         *     <LI> <u>Allowed characters in path segments</u>: This
-         *             implementation does not allow non-terminal NULL
-         *             segments in the the path -- IOExceptions may be thrown;
-         *     <LI> <u>"<code>.</code>" and "<code>..</code>" path
-         *             segments</u>:
-         *             This implementation does not allow "<code>.</code>" and
-         *             "<code>..</code>" in the the path, and such characters
-         *             will result in an IOException being thrown (this should
-         *             never happen since Tomcat normalises the requestURI
-         *             before determining the contextPath, servletPath and
-         *             pathInfo);
-         *     <LI> <u>Implementation limitations</u>: This implementation
-         *             does not impose any limitations except as documented
-         *             above.  This implementation may be limited by the
-         *             servlet container used to house this implementation.
-         *             In particular, all the primary CGI variable values
-         *             are derived either directly or indirectly from the
-         *             container's implementation of the Servlet API methods.
-         *     </ul>
+         * <LI>Servers SHOULD provide the "<code>query</code>" component of the script-URI as command-line arguments to
+         * scripts if it does not contain any unencoded "=" characters and the command-line arguments can be generated
+         * in an unambiguous manner.
+         * <LI>Servers SHOULD set the AUTH_TYPE metavariable to the value of the "<code>auth-scheme</code>" token of the
+         * "<code>Authorization</code>" if it was supplied as part of the request header. See
+         * <code>getCGIEnvironment</code> method.
+         * <LI>Where applicable, servers SHOULD set the current working directory to the directory in which the script
+         * is located before invoking it.
+         * <LI>Server implementations SHOULD define their behavior for the following cases:
+         * <ul>
+         * <LI><u>Allowed characters in pathInfo</u>: This implementation does not allow ASCII NUL nor any character
+         * which cannot be URL-encoded according to internet standards;
+         * <LI><u>Allowed characters in path segments</u>: This implementation does not allow non-terminal NULL segments
+         * in the the path -- IOExceptions may be thrown;
+         * <LI><u>"<code>.</code>" and "<code>..</code>" path segments</u>: This implementation does not allow
+         * "<code>.</code>" and "<code>..</code>" in the the path, and such characters will result in an IOException
+         * being thrown (this should never happen since Tomcat normalises the requestURI before determining the
+         * contextPath, servletPath and pathInfo);
+         * <LI><u>Implementation limitations</u>: This implementation does not impose any limitations except as
+         * documented above. This implementation may be limited by the servlet container used to house this
+         * implementation. In particular, all the primary CGI variable values are derived either directly or indirectly
+         * from the container's implementation of the Servlet API methods.
+         * </ul>
          * </UL>
          *
          * @exception IOException if problems during reading/writing occur
          *
-         * @see    java.lang.Runtime#exec(String command, String[] envp,
-         *                                File dir)
+         * @see java.lang.Runtime#exec(String command, String[] envp, File dir)
          */
         protected void run() throws IOException {
 
             /*
-             * REMIND:  this method feels too big; should it be re-written?
+             * REMIND: this method feels too big; should it be re-written?
              */
 
             if (!isReady()) {
@@ -1597,15 +1442,14 @@ public final class CGIServlet extends HttpServlet {
             }
 
             if ((command.contains(File.separator + "." + File.separator)) ||
-                    (command.contains(File.separator + "..")) ||
-                    (command.contains(".." + File.separator))) {
+                    (command.contains(File.separator + "..")) || (command.contains(".." + File.separator))) {
                 throw new IOException(this.getClass().getName() + "Illegal Character in CGI command path " +
                         "('.' or '..') detected.  Not running CGI [" + command + "].");
             }
 
-            /* original content/structure of this section taken from
-             * http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=4216884
-             * with major modifications by Martin Dengler
+            /*
+             * original content/structure of this section taken from
+             * http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=4216884 with major modifications by Martin Dengler
              */
             Runtime rt = null;
             BufferedReader cgiHeaderReader = null;
@@ -1628,36 +1472,31 @@ public final class CGIServlet extends HttpServlet {
 
             try {
                 rt = Runtime.getRuntime();
-                proc = rt.exec(
-                        cmdAndArgs.toArray(new String[0]),
-                        hashToStringArray(env), wd);
+                proc = rt.exec(cmdAndArgs.toArray(new String[0]), hashToStringArray(env), wd);
 
                 String sContentLength = env.get("CONTENT_LENGTH");
 
-                if(!"".equals(sContentLength)) {
+                if (!"".equals(sContentLength)) {
                     commandsStdIn = new BufferedOutputStream(proc.getOutputStream());
                     IOTools.flow(stdin, commandsStdIn);
                     commandsStdIn.flush();
                     commandsStdIn.close();
                 }
 
-                /* we want to wait for the process to exit,  Process.waitFor()
-                 * is useless in our situation; see
+                /*
+                 * we want to wait for the process to exit, Process.waitFor() is useless in our situation; see
                  * http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=4223650
                  */
 
                 boolean isRunning = true;
-                commandsStdErr = new BufferedReader
-                    (new InputStreamReader(proc.getErrorStream()));
-                final BufferedReader stdErrRdr = commandsStdErr ;
+                commandsStdErr = new BufferedReader(new InputStreamReader(proc.getErrorStream()));
+                final BufferedReader stdErrRdr = commandsStdErr;
 
                 errReaderThread = new Thread(() -> sendToLog(stdErrRdr));
                 errReaderThread.start();
 
-                InputStream cgiHeaderStream =
-                    new HTTPHeaderInputStream(proc.getInputStream());
-                cgiHeaderReader =
-                    new BufferedReader(new InputStreamReader(cgiHeaderStream));
+                InputStream cgiHeaderStream = new HTTPHeaderInputStream(proc.getInputStream());
+                cgiHeaderReader = new BufferedReader(new InputStreamReader(cgiHeaderStream));
 
                 // Need to be careful here. If sendError() is called the
                 // response body should be provided by the standard error page
@@ -1667,7 +1506,7 @@ public final class CGIServlet extends HttpServlet {
 
                 while (isRunning) {
                     try {
-                        //set headers
+                        // set headers
                         String line = null;
                         while (((line = cgiHeaderReader.readLine()) != null) && !line.isEmpty()) {
                             if (log.isTraceEnabled()) {
@@ -1676,21 +1515,19 @@ public final class CGIServlet extends HttpServlet {
                             if (line.startsWith("HTTP")) {
                                 skipBody = setStatus(response, getSCFromHttpStatusLine(line));
                             } else if (line.indexOf(':') >= 0) {
-                                String header =
-                                    line.substring(0, line.indexOf(':')).trim();
-                                String value =
-                                    line.substring(line.indexOf(':') + 1).trim();
+                                String header = line.substring(0, line.indexOf(':')).trim();
+                                String value = line.substring(line.indexOf(':') + 1).trim();
                                 if (header.equalsIgnoreCase("status")) {
                                     skipBody = setStatus(response, getSCFromCGIStatusHeader(value));
                                 } else {
-                                    response.addHeader(header , value);
+                                    response.addHeader(header, value);
                                 }
                             } else {
                                 log.info(sm.getString("cgiServlet.runBadHeader", line));
                             }
                         }
 
-                        //write output
+                        // write output
                         byte[] bBuf = new byte[2048];
 
                         OutputStream out = response.getOutputStream();
@@ -1725,9 +1562,9 @@ public final class CGIServlet extends HttpServlet {
                             // Ignore
                         }
                     }
-                } //replacement for Process.waitFor()
+                } // replacement for Process.waitFor()
 
-            } catch (IOException e){
+            } catch (IOException e) {
                 log.warn(sm.getString("cgiServlet.runFail"), e);
                 throw e;
             } finally {
@@ -1752,9 +1589,10 @@ public final class CGIServlet extends HttpServlet {
                     try {
                         errReaderThread.join(stderrTimeout);
                     } catch (InterruptedException e) {
-                        log.warn(sm.getString("cgiServlet.runReaderInterrupt"));                    }
+                        log.warn(sm.getString("cgiServlet.runReaderInterrupt"));
+                    }
                 }
-                if (proc != null){
+                if (proc != null) {
                     proc.destroy();
                     proc = null;
                 }
@@ -1765,8 +1603,9 @@ public final class CGIServlet extends HttpServlet {
          * Parses the Status-Line and extracts the status code.
          *
          * @param line The HTTP Status-Line (RFC2616, section 6.1)
-         * @return The extracted status code or the code representing an
-         * internal error if a valid status code cannot be extracted.
+         *
+         * @return The extracted status code or the code representing an internal error if a valid status code cannot be
+         *             extracted.
          */
         private int getSCFromHttpStatusLine(String line) {
             int statusStart = line.indexOf(' ') + 1;
@@ -1796,8 +1635,9 @@ public final class CGIServlet extends HttpServlet {
          *
          * @param value The CGI Status value of the form <code>
          *             digit digit digit SP reason-phrase</code>
-         * @return The extracted status code or the code representing an
-         * internal error if a valid status code cannot be extracted.
+         *
+         * @return The extracted status code or the code representing an internal error if a valid status code cannot be
+         *             extracted.
          */
         private int getSCFromCGIStatusHeader(String value) {
             if (value.length() < 3) {
@@ -1822,11 +1662,11 @@ public final class CGIServlet extends HttpServlet {
 
         private void sendToLog(BufferedReader rdr) {
             String line = null;
-            int lineCount = 0 ;
+            int lineCount = 0;
             try {
                 while ((line = rdr.readLine()) != null) {
                     log.warn(sm.getString("cgiServlet.runStdErr", line));
-                    lineCount++ ;
+                    lineCount++;
                 }
             } catch (IOException e) {
                 log.warn(sm.getString("cgiServlet.runStdErrFail"), e);
@@ -1841,12 +1681,11 @@ public final class CGIServlet extends HttpServlet {
                 log.warn(sm.getString("cgiServlet.runStdErrCount", Integer.valueOf(lineCount)));
             }
         }
-    } //class CGIRunner
+    } // class CGIRunner
 
     /**
-     * This is an input stream specifically for reading HTTP headers. It reads
-     * up to and including the two blank lines terminating the headers. It
-     * allows the content to be read using bytes or characters as appropriate.
+     * This is an input stream specifically for reading HTTP headers. It reads up to and including the two blank lines
+     * terminating the headers. It allows the content to be read using bytes or characters as appropriate.
      */
     protected static class HTTPHeaderInputStream extends InputStream {
         private static final int STATE_CHARACTER = 0;
@@ -1896,7 +1735,7 @@ public final class CGIServlet extends HttpServlet {
              */
             if (i == 10) {
                 // LF
-                switch(state) {
+                switch (state) {
                     case STATE_CHARACTER:
                         state = STATE_FIRST_LF;
                         break;
@@ -1911,7 +1750,7 @@ public final class CGIServlet extends HttpServlet {
 
             } else if (i == 13) {
                 // CR
-                switch(state) {
+                switch (state) {
                     case STATE_CHARACTER:
                         state = STATE_FIRST_CR;
                         break;
@@ -1929,6 +1768,6 @@ public final class CGIServlet extends HttpServlet {
 
             return i;
         }
-    }  // class HTTPHeaderInputStream
+    } // class HTTPHeaderInputStream
 
-} //class CGIServlet
+} // class CGIServlet
diff --git a/java/org/apache/catalina/servlets/DefaultServlet.java b/java/org/apache/catalina/servlets/DefaultServlet.java
index 1ba7b3e637..76f23e7e58 100644
--- a/java/org/apache/catalina/servlets/DefaultServlet.java
+++ b/java/org/apache/catalina/servlets/DefaultServlet.java
@@ -93,23 +93,26 @@ import org.xml.sax.ext.EntityResolver2;
 
 
 /**
- * <p>The default resource-serving servlet for most web applications,
- * used to serve static resources such as HTML pages and images.
+ * <p>
+ * The default resource-serving servlet for most web applications, used to serve static resources such as HTML pages and
+ * images.
  * </p>
  * <p>
  * This servlet is intended to be mapped to <em>/</em> e.g.:
  * </p>
+ *
  * <pre>
  *   &lt;servlet-mapping&gt;
  *       &lt;servlet-name&gt;default&lt;/servlet-name&gt;
  *       &lt;url-pattern&gt;/&lt;/url-pattern&gt;
  *   &lt;/servlet-mapping&gt;
  * </pre>
- * <p>It can be mapped to sub-paths, however in all cases resources are served
- * from the web application resource root using the full path from the root
- * of the web application context.
- * <br>e.g. given a web application structure:
+ * <p>
+ * It can be mapped to sub-paths, however in all cases resources are served from the web application resource root using
+ * the full path from the root of the web application context. <br>
+ * e.g. given a web application structure:
  * </p>
+ *
  * <pre>
  * /context
  *   /images
@@ -121,6 +124,7 @@ import org.xml.sax.ext.EntityResolver2;
  * <p>
  * ... and a servlet mapping that maps only <code>/static/*</code> to the default servlet:
  * </p>
+ *
  * <pre>
  *   &lt;servlet-mapping&gt;
  *       &lt;servlet-name&gt;default&lt;/servlet-name&gt;
@@ -128,9 +132,10 @@ import org.xml.sax.ext.EntityResolver2;
  *   &lt;/servlet-mapping&gt;
  * </pre>
  * <p>
- * Then a request to <code>/context/static/images/tomcat.jpg</code> will succeed
- * while a request to <code>/context/images/tomcat2.jpg</code> will fail.
+ * Then a request to <code>/context/static/images/tomcat.jpg</code> will succeed while a request to
+ * <code>/context/images/tomcat2.jpg</code> will fail.
  * </p>
+ *
  * @author Craig R. McClanahan
  * @author Remy Maucherat
  */
@@ -238,15 +243,14 @@ public class DefaultServlet extends HttpServlet {
     protected transient WebResourceRoot resources = null;
 
     /**
-     * File encoding to be used when reading static files. If none is specified
-     * the platform default is used.
+     * File encoding to be used when reading static files. If none is specified the platform default is used.
      */
     protected String fileEncoding = null;
     private transient Charset fileEncodingCharset = null;
 
     /**
-     * If a file has a BOM, should that be used in preference to fileEncoding?
-     * Will default to {@link BomConfig#TRUE} in {@link #init()}.
+     * If a file has a BOM, should that be used in preference to fileEncoding? Will default to {@link BomConfig#TRUE} in
+     * {@link #init()}.
      */
     private BomConfig useBomIfPresent = null;
 
@@ -316,8 +320,7 @@ public class DefaultServlet extends HttpServlet {
             readOnly = Boolean.parseBoolean(getServletConfig().getInitParameter("readonly"));
         }
 
-        compressionFormats = parseCompressionFormats(
-                getServletConfig().getInitParameter("precompressed"),
+        compressionFormats = parseCompressionFormats(getServletConfig().getInitParameter("precompressed"),
                 getServletConfig().getInitParameter("gzip"));
 
         if (getServletConfig().getInitParameter("sendfileSize") != null) {
@@ -349,8 +352,8 @@ public class DefaultServlet extends HttpServlet {
             }
             if (this.useBomIfPresent == null) {
                 // Unrecognised configuration value
-                IllegalArgumentException iae = new IllegalArgumentException(
-                        sm.getString("defaultServlet.unknownBomConfig", useBomIfPresent));
+                IllegalArgumentException iae =
+                        new IllegalArgumentException(sm.getString("defaultServlet.unknownBomConfig", useBomIfPresent));
                 throw new ServletException(iae);
             }
         }
@@ -373,8 +376,7 @@ public class DefaultServlet extends HttpServlet {
         }
 
         if (debug > 0) {
-            log("DefaultServlet.init:  input buffer size=" + input +
-                ", output buffer size=" + output);
+            log("DefaultServlet.init:  input buffer size=" + input + ", output buffer size=" + output);
         }
 
         // Load the web resources
@@ -391,10 +393,11 @@ public class DefaultServlet extends HttpServlet {
         if (getServletConfig().getInitParameter("sortListings") != null) {
             sortListings = Boolean.parseBoolean(getServletConfig().getInitParameter("sortListings"));
 
-            if(sortListings) {
+            if (sortListings) {
                 boolean sortDirectoriesFirst;
                 if (getServletConfig().getInitParameter("sortDirectoriesFirst") != null) {
-                    sortDirectoriesFirst = Boolean.parseBoolean(getServletConfig().getInitParameter("sortDirectoriesFirst"));
+                    sortDirectoriesFirst =
+                            Boolean.parseBoolean(getServletConfig().getInitParameter("sortDirectoriesFirst"));
                 } else {
                     sortDirectoriesFirst = false;
                 }
@@ -437,6 +440,7 @@ public class DefaultServlet extends HttpServlet {
      * Return the relative path associated with this servlet.
      *
      * @param request The servlet request we are processing
+     *
      * @return the relative path
      */
     protected String getRelativePath(HttpServletRequest request) {
@@ -478,10 +482,11 @@ public class DefaultServlet extends HttpServlet {
 
 
     /**
-     * Determines the appropriate path to prepend resources with
-     * when generating directory listings. Depending on the behaviour of
-     * {@link #getRelativePath(HttpServletRequest)} this will change.
+     * Determines the appropriate path to prepend resources with when generating directory listings. Depending on the
+     * behaviour of {@link #getRelativePath(HttpServletRequest)} this will change.
+     *
      * @param request the request to determine the path for
+     *
      * @return the prefix to apply to all resources in the listing.
      */
     protected String getPathPrefix(final HttpServletRequest request) {
@@ -490,8 +495,7 @@ public class DefaultServlet extends HttpServlet {
 
 
     @Override
-    protected void service(HttpServletRequest req, HttpServletResponse resp)
-            throws ServletException, IOException {
+    protected void service(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
 
         if (req.getDispatcherType() == DispatcherType.ERROR) {
             doGet(req, resp);
@@ -504,16 +508,15 @@ public class DefaultServlet extends HttpServlet {
     /**
      * Process a GET request for the specified resource.
      *
-     * @param request The servlet request we are processing
+     * @param request  The servlet request we are processing
      * @param response The servlet response we are creating
      *
-     * @exception IOException if an input/output error occurs
+     * @exception IOException      if an input/output error occurs
      * @exception ServletException if a servlet-specified error occurs
      */
     @Override
-    protected void doGet(HttpServletRequest request,
-                         HttpServletResponse response)
-        throws IOException, ServletException {
+    protected void doGet(HttpServletRequest request, HttpServletResponse response)
+            throws IOException, ServletException {
 
         // Serve the requested resource, including the data content
         serveResource(request, response, true, fileEncoding);
@@ -524,10 +527,10 @@ public class DefaultServlet extends HttpServlet {
     /**
      * Process a HEAD request for the specified resource.
      *
-     * @param request The servlet request we are processing
+     * @param request  The servlet request we are processing
      * @param response The servlet response we are creating
      *
-     * @exception IOException if an input/output error occurs
+     * @exception IOException      if an input/output error occurs
      * @exception ServletException if a servlet-specified error occurs
      */
     @Override
@@ -542,27 +545,16 @@ public class DefaultServlet extends HttpServlet {
 
 
     /**
-     * Override default implementation to ensure that TRACE is correctly
-     * handled.
+     * Override default implementation to ensure that TRACE is correctly handled.
      *
-     * @param req   the {@link HttpServletRequest} object that
-     *                  contains the request the client made of
-     *                  the servlet
+     * @param req  the {@link HttpServletRequest} object that contains the request the client made of the servlet
+     * @param resp the {@link HttpServletResponse} object that contains the response the servlet returns to the client
      *
-     * @param resp  the {@link HttpServletResponse} object that
-     *                  contains the response the servlet returns
-     *                  to the client
-     *
-     * @exception IOException   if an input or output error occurs
-     *                              while the servlet is handling the
-     *                              OPTIONS request
-     *
-     * @exception ServletException  if the request for the
-     *                                  OPTIONS cannot be handled
+     * @exception IOException      if an input or output error occurs while the servlet is handling the OPTIONS request
+     * @exception ServletException if the request for the OPTIONS cannot be handled
      */
     @Override
-    protected void doOptions(HttpServletRequest req, HttpServletResponse resp)
-        throws ServletException, IOException {
+    protected void doOptions(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
 
         resp.setHeader("Allow", determineMethodsAllowed(req));
     }
@@ -580,8 +572,7 @@ public class DefaultServlet extends HttpServlet {
         }
 
         // Trace - assume disabled unless we can prove otherwise
-        if (req instanceof RequestFacade &&
-                ((RequestFacade) req).getAllowTrace()) {
+        if (req instanceof RequestFacade && ((RequestFacade) req).getAllowTrace()) {
             allow.append(", TRACE");
         }
 
@@ -589,8 +580,7 @@ public class DefaultServlet extends HttpServlet {
     }
 
 
-    protected void sendNotAllowed(HttpServletRequest req, HttpServletResponse resp)
-            throws IOException {
+    protected void sendNotAllowed(HttpServletRequest req, HttpServletResponse resp) throws IOException {
         resp.addHeader("Allow", determineMethodsAllowed(req));
         resp.sendError(HttpServletResponse.SC_METHOD_NOT_ALLOWED);
     }
@@ -599,16 +589,15 @@ public class DefaultServlet extends HttpServlet {
     /**
      * Process a POST request for the specified resource.
      *
-     * @param request The servlet request we are processing
+     * @param request  The servlet request we are processing
      * @param response The servlet response we are creating
      *
-     * @exception IOException if an input/output error occurs
+     * @exception IOException      if an input/output error occurs
      * @exception ServletException if a servlet-specified error occurs
      */
     @Override
-    protected void doPost(HttpServletRequest request,
-                          HttpServletResponse response)
-        throws IOException, ServletException {
+    protected void doPost(HttpServletRequest request, HttpServletResponse response)
+            throws IOException, ServletException {
         doGet(request, response);
     }
 
@@ -616,15 +605,14 @@ public class DefaultServlet extends HttpServlet {
     /**
      * Process a PUT request for the specified resource.
      *
-     * @param req The servlet request we are processing
+     * @param req  The servlet request we are processing
      * @param resp The servlet response we are creating
      *
-     * @exception IOException if an input/output error occurs
+     * @exception IOException      if an input/output error occurs
      * @exception ServletException if a servlet-specified error occurs
      */
     @Override
-    protected void doPut(HttpServletRequest req, HttpServletResponse resp)
-        throws ServletException, IOException {
+    protected void doPut(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
 
         if (readOnly) {
             sendNotAllowed(req, resp);
@@ -678,24 +666,23 @@ public class DefaultServlet extends HttpServlet {
 
 
     /**
-     * Handle a partial PUT.  New content specified in request is appended to
-     * existing content in oldRevisionContent (if present). This code does
-     * not support simultaneous partial updates to the same resource.
-     * @param req The Servlet request
+     * Handle a partial PUT. New content specified in request is appended to existing content in oldRevisionContent (if
+     * present). This code does not support simultaneous partial updates to the same resource.
+     *
+     * @param req   The Servlet request
      * @param range The range that will be written
-     * @param path The path
+     * @param path  The path
+     *
      * @return the associated file object
+     *
      * @throws IOException an IO error occurred
      */
-    protected File executePartialPut(HttpServletRequest req, Range range,
-                                     String path)
-        throws IOException {
+    protected File executePartialPut(HttpServletRequest req, Range range, String path) throws IOException {
 
         // Append data specified in ranges to existing content for this
         // resource - create a temp. file on the local filesystem to
         // perform this operation
-        File tempDir = (File) getServletContext().getAttribute
-            (ServletContext.TEMPDIR);
+        File tempDir = (File) getServletContext().getAttribute(ServletContext.TEMPDIR);
         // Convert all '/' characters to '.' in resourcePath
         String convertedResourcePath = path.replace('/', '.');
         File contentFile = new File(tempDir, convertedResourcePath);
@@ -704,16 +691,14 @@ public class DefaultServlet extends HttpServlet {
             contentFile.deleteOnExit();
         }
 
-        try (RandomAccessFile randAccessContentFile =
-            new RandomAccessFile(contentFile, "rw")) {
+        try (RandomAccessFile randAccessContentFile = new RandomAccessFile(contentFile, "rw")) {
 
             WebResource oldResource = resources.getResource(path);
 
             // Copy data in oldRevisionContent to contentFile
             if (oldResource.isFile()) {
                 try (BufferedInputStream bufOldRevStream =
-                    new BufferedInputStream(oldResource.getInputStream(),
-                            BUFFER_SIZE)) {
+                        new BufferedInputStream(oldResource.getInputStream(), BUFFER_SIZE)) {
 
                     int numBytesRead;
                     byte[] copyBuffer = new byte[BUFFER_SIZE];
@@ -730,8 +715,7 @@ public class DefaultServlet extends HttpServlet {
             randAccessContentFile.seek(range.start);
             int numBytesRead;
             byte[] transferBuffer = new byte[BUFFER_SIZE];
-            try (BufferedInputStream requestBufInStream =
-                new BufferedInputStream(req.getInputStream(), BUFFER_SIZE)) {
+            try (BufferedInputStream requestBufInStream = new BufferedInputStream(req.getInputStream(), BUFFER_SIZE)) {
                 while ((numBytesRead = requestBufInStream.read(transferBuffer)) != -1) {
                     randAccessContentFile.write(transferBuffer, 0, numBytesRead);
                 }
@@ -745,15 +729,14 @@ public class DefaultServlet extends HttpServlet {
     /**
      * Process a DELETE request for the specified resource.
      *
-     * @param req The servlet request we are processing
+     * @param req  The servlet request we are processing
      * @param resp The servlet response we are creating
      *
-     * @exception IOException if an input/output error occurs
+     * @exception IOException      if an input/output error occurs
      * @exception ServletException if a servlet-specified error occurs
      */
     @Override
-    protected void doDelete(HttpServletRequest req, HttpServletResponse resp)
-        throws ServletException, IOException {
+    protected void doDelete(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
 
         if (readOnly) {
             sendNotAllowed(req, resp);
@@ -778,26 +761,22 @@ public class DefaultServlet extends HttpServlet {
 
 
     /**
-     * Check if the conditions specified in the optional If headers are
-     * satisfied.
+     * Check if the conditions specified in the optional If headers are satisfied.
+     *
+     * @param request  The servlet request we are processing
+     * @param response The servlet response we are creating
+     * @param resource The resource
+     *
+     * @return <code>true</code> if the resource meets all the specified conditions, and <code>false</code> if any of
+     *             the conditions is not satisfied, in which case request processing is stopped
      *
-     * @param request   The servlet request we are processing
-     * @param response  The servlet response we are creating
-     * @param resource  The resource
-     * @return <code>true</code> if the resource meets all the specified
-     *  conditions, and <code>false</code> if any of the conditions is not
-     *  satisfied, in which case request processing is stopped
      * @throws IOException an IO error occurred
      */
-    protected boolean checkIfHeaders(HttpServletRequest request,
-                                     HttpServletResponse response,
-                                     WebResource resource)
-        throws IOException {
+    protected boolean checkIfHeaders(HttpServletRequest request, HttpServletResponse response, WebResource resource)
+            throws IOException {
 
-        return checkIfMatch(request, response, resource)
-            && checkIfModifiedSince(request, response, resource)
-            && checkIfNoneMatch(request, response, resource)
-            && checkIfUnmodifiedSince(request, response, resource);
+        return checkIfMatch(request, response, resource) && checkIfModifiedSince(request, response, resource) &&
+                checkIfNoneMatch(request, response, resource) && checkIfUnmodifiedSince(request, response, resource);
 
     }
 
@@ -806,6 +785,7 @@ public class DefaultServlet extends HttpServlet {
      * URL rewriter.
      *
      * @param path Path which has to be rewritten
+     *
      * @return the rewritten path
      */
     protected String rewriteUrl(String path) {
@@ -819,17 +799,14 @@ public class DefaultServlet extends HttpServlet {
      * @param request       The servlet request we are processing
      * @param response      The servlet response we are creating
      * @param content       Should the content be included?
-     * @param inputEncoding The encoding to use if it is necessary to access the
-     *                      source as characters rather than as bytes
+     * @param inputEncoding The encoding to use if it is necessary to access the source as characters rather than as
+     *                          bytes
      *
-     * @exception IOException if an input/output error occurs
+     * @exception IOException      if an input/output error occurs
      * @exception ServletException if a servlet-specified error occurs
      */
-    protected void serveResource(HttpServletRequest request,
-                                 HttpServletResponse response,
-                                 boolean content,
-                                 String inputEncoding)
-        throws IOException, ServletException {
+    protected void serveResource(HttpServletRequest request, HttpServletResponse response, boolean content,
+            String inputEncoding) throws IOException, ServletException {
 
         boolean serveContent = content;
 
@@ -838,11 +815,9 @@ public class DefaultServlet extends HttpServlet {
 
         if (debug > 0) {
             if (serveContent) {
-                log("DefaultServlet.serveResource:  Serving resource '" +
-                    path + "' headers and data");
+                log("DefaultServlet.serveResource:  Serving resource '" + path + "' headers and data");
             } else {
-                log("DefaultServlet.serveResource:  Serving resource '" +
-                    path + "' headers only");
+                log("DefaultServlet.serveResource:  Serving resource '" + path + "' headers only");
             }
         }
 
@@ -858,20 +833,17 @@ public class DefaultServlet extends HttpServlet {
         if (!resource.exists()) {
             // Check if we're included so we can return the appropriate
             // missing resource name in the error
-            String requestUri = (String) request.getAttribute(
-                    RequestDispatcher.INCLUDE_REQUEST_URI);
+            String requestUri = (String) request.getAttribute(RequestDispatcher.INCLUDE_REQUEST_URI);
             if (requestUri == null) {
                 requestUri = request.getRequestURI();
             } else {
                 // We're included
                 // SRV.9.3 says we must throw a FNFE
-                throw new FileNotFoundException(sm.getString(
-                        "defaultServlet.missingResource", requestUri));
+                throw new FileNotFoundException(sm.getString("defaultServlet.missingResource", requestUri));
             }
 
             if (isError) {
-                response.sendError(((Integer) request.getAttribute(
-                        RequestDispatcher.ERROR_STATUS_CODE)).intValue());
+                response.sendError(((Integer) request.getAttribute(RequestDispatcher.ERROR_STATUS_CODE)).intValue());
             } else {
                 response.sendError(HttpServletResponse.SC_NOT_FOUND,
                         sm.getString("defaultServlet.missingResource", requestUri));
@@ -882,21 +854,18 @@ public class DefaultServlet extends HttpServlet {
         if (!resource.canRead()) {
             // Check if we're included so we can return the appropriate
             // missing resource name in the error
-            String requestUri = (String) request.getAttribute(
-                    RequestDispatcher.INCLUDE_REQUEST_URI);
+            String requestUri = (String) request.getAttribute(RequestDispatcher.INCLUDE_REQUEST_URI);
             if (requestUri == null) {
                 requestUri = request.getRequestURI();
             } else {
                 // We're included
                 // Spec doesn't say what to do in this case but a FNFE seems
                 // reasonable
-                throw new FileNotFoundException(sm.getString(
-                        "defaultServlet.missingResource", requestUri));
+                throw new FileNotFoundException(sm.getString("defaultServlet.missingResource", requestUri));
             }
 
             if (isError) {
-                response.sendError(((Integer) request.getAttribute(
-                        RequestDispatcher.ERROR_STATUS_CODE)).intValue());
+                response.sendError(((Integer) request.getAttribute(RequestDispatcher.ERROR_STATUS_CODE)).intValue());
             } else {
                 response.sendError(HttpServletResponse.SC_FORBIDDEN, requestUri);
             }
@@ -908,8 +877,7 @@ public class DefaultServlet extends HttpServlet {
         // satisfied.
         if (resource.isFile()) {
             // Checking If headers
-            included = (request.getAttribute(
-                    RequestDispatcher.INCLUDE_CONTEXT_PATH) != null);
+            included = (request.getAttribute(RequestDispatcher.INCLUDE_CONTEXT_PATH) != null);
             if (!included && !isError && !checkIfHeaders(request, response, resource)) {
                 return;
             }
@@ -935,14 +903,11 @@ public class DefaultServlet extends HttpServlet {
 
         // Serve a precompressed version of the file if present
         boolean usingPrecompressedVersion = false;
-        if (compressionFormats.length > 0 && !included && resource.isFile() &&
-                !pathEndsWithCompressedExtension(path)) {
-            List<PrecompressedResource> precompressedResources =
-                    getAvailablePrecompressedResources(path);
+        if (compressionFormats.length > 0 && !included && resource.isFile() && !pathEndsWithCompressedExtension(path)) {
+            List<PrecompressedResource> precompressedResources = getAvailablePrecompressedResources(path);
             if (!precompressedResources.isEmpty()) {
                 ResponseUtil.addVaryFieldName(response, "accept-encoding");
-                PrecompressedResource bestResource =
-                        getBestPrecompressedResource(request, precompressedResources);
+                PrecompressedResource bestResource = getBestPrecompressedResource(request, precompressedResources);
                 if (bestResource != null) {
                     response.addHeader("Content-Encoding", bestResource.format.encoding);
                     resource = bestResource.resource;
@@ -1036,17 +1001,13 @@ public class DefaultServlet extends HttpServlet {
         Charset charset = B2CConverter.getCharset(outputEncoding);
         boolean conversionRequired;
         /*
-         * The test below deliberately uses != to compare two Strings. This is
-         * because the code is looking to see if the default character encoding
-         * has been returned because no explicit character encoding has been
-         * defined. There is no clean way of doing this via the Servlet API. It
-         * would be possible to add a Tomcat specific API but that would require
-         * quite a bit of code to get to the Tomcat specific request object that
-         * may have been wrapped. The != test is a (slightly hacky) quick way of
-         * doing this.
+         * The test below deliberately uses != to compare two Strings. This is because the code is looking to see if the
+         * default character encoding has been returned because no explicit character encoding has been defined. There
+         * is no clean way of doing this via the Servlet API. It would be possible to add a Tomcat specific API but that
+         * would require quite a bit of code to get to the Tomcat specific request object that may have been wrapped.
+         * The != test is a (slightly hacky) quick way of doing this.
          */
-        boolean outputEncodingSpecified =
-                outputEncoding != org.apache.coyote.Constants.DEFAULT_BODY_CHARSET.name() &&
+        boolean outputEncodingSpecified = outputEncoding != org.apache.coyote.Constants.DEFAULT_BODY_CHARSET.name() &&
                 outputEncoding != resources.getContext().getResponseCharacterEncoding();
         if (!usingPrecompressedVersion && isText(contentType) && outputEncodingSpecified &&
                 !charset.equals(fileEncodingCharset)) {
@@ -1058,23 +1019,20 @@ public class DefaultServlet extends HttpServlet {
             conversionRequired = false;
         }
 
-        if (resource.isDirectory() || isError || ranges == FULL ) {
+        if (resource.isDirectory() || isError || ranges == FULL) {
             // Set the appropriate output headers
             if (contentType != null) {
                 if (debug > 0) {
-                    log("DefaultServlet.serveFile:  contentType='" +
-                        contentType + "'");
+                    log("DefaultServlet.serveFile:  contentType='" + contentType + "'");
                 }
                 // Don't override a previously set content type
                 if (response.getContentType() == null) {
                     response.setContentType(contentType);
                 }
             }
-            if (resource.isFile() && contentLength >= 0 &&
-                    (!serveContent || ostream != null)) {
+            if (resource.isFile() && contentLength >= 0 && (!serveContent || ostream != null)) {
                 if (debug > 0) {
-                    log("DefaultServlet.serveFile:  contentLength=" +
-                        contentLength);
+                    log("DefaultServlet.serveFile:  contentLength=" + contentLength);
                 }
                 // Don't set a content length if something else has already
                 // written to the response or if conversion will be taking place
@@ -1184,17 +1142,13 @@ public class DefaultServlet extends HttpServlet {
             if (ranges.size() == 1) {
 
                 Range range = ranges.get(0);
-                response.addHeader("Content-Range", "bytes "
-                                   + range.start
-                                   + "-" + range.end + "/"
-                                   + range.length);
+                response.addHeader("Content-Range", "bytes " + range.start + "-" + range.end + "/" + range.length);
                 long length = range.end - range.start + 1;
                 response.setContentLengthLong(length);
 
                 if (contentType != null) {
                     if (debug > 0) {
-                        log("DefaultServlet.serveFile:  contentType='" +
-                            contentType + "'");
+                        log("DefaultServlet.serveFile:  contentType='" + contentType + "'");
                     }
                     response.setContentType(contentType);
                 }
@@ -1206,8 +1160,7 @@ public class DefaultServlet extends HttpServlet {
                         // Silent catch
                     }
                     if (ostream != null) {
-                        if (!checkSendfile(request, response, resource,
-                                range.end - range.start + 1, range)) {
+                        if (!checkSendfile(request, response, resource, range.end - range.start + 1, range)) {
                             copy(resource, ostream, range);
                         }
                     } else {
@@ -1216,8 +1169,7 @@ public class DefaultServlet extends HttpServlet {
                     }
                 }
             } else {
-                response.setContentType("multipart/byteranges; boundary="
-                                        + mimeSeparation);
+                response.setContentType("multipart/byteranges; boundary=" + mimeSeparation);
                 if (serveContent) {
                     try {
                         response.setBufferSize(output);
@@ -1320,8 +1272,8 @@ public class DefaultServlet extends HttpServlet {
 
 
     private static boolean isText(String contentType) {
-        return  contentType == null || contentType.startsWith("text") ||
-                contentType.endsWith("xml") || contentType.contains("/javascript");
+        return contentType == null || contentType.startsWith("text") || contentType.endsWith("xml") ||
+                contentType.contains("/javascript");
     }
 
 
@@ -1348,8 +1300,9 @@ public class DefaultServlet extends HttpServlet {
     /**
      * Match the client preferred encoding formats to the available precompressed resources.
      *
-     * @param request   The servlet request we are processing
-     * @param precompressedResources   List of available precompressed resources.
+     * @param request                The servlet request we are processing
+     * @param precompressedResources List of available precompressed resources.
+     *
      * @return The best matching precompressed resource or null if no match was found.
      */
     private PrecompressedResource getBestPrecompressedResource(HttpServletRequest request,
@@ -1405,8 +1358,7 @@ public class DefaultServlet extends HttpServlet {
         return bestResource;
     }
 
-    private void doDirectoryRedirect(HttpServletRequest request, HttpServletResponse response)
-            throws IOException {
+    private void doDirectoryRedirect(HttpServletRequest request, HttpServletResponse response) throws IOException {
         StringBuilder location = new StringBuilder(request.getRequestURI());
         location.append('/');
         if (request.getQueryString() != null) {
@@ -1423,16 +1375,15 @@ public class DefaultServlet extends HttpServlet {
     /**
      * Parse the content-range header.
      *
-     * @param request The servlet request we are processing
+     * @param request  The servlet request we are processing
      * @param response The servlet response we are creating
-     * @return the partial content-range, {@code null} if the content-range
-     *         header was invalid or {@code #IGNORE} if there is no header to
-     *         process
+     *
+     * @return the partial content-range, {@code null} if the content-range header was invalid or {@code #IGNORE} if
+     *             there is no header to process
+     *
      * @throws IOException an IO error occurred
      */
-    protected Range parseContentRange(HttpServletRequest request,
-                                      HttpServletResponse response)
-        throws IOException {
+    protected Range parseContentRange(HttpServletRequest request, HttpServletResponse response) throws IOException {
 
         // Retrieving the content-range header (if any is specified
         String contentRangeHeader = request.getHeader("Content-Range");
@@ -1479,15 +1430,16 @@ public class DefaultServlet extends HttpServlet {
     /**
      * Parse the range header.
      *
-     * @param request   The servlet request we are processing
-     * @param response  The servlet response we are creating
-     * @param resource  The resource
-     * @return a list of ranges, {@code null} if the range header was invalid or
-     *         {@code #FULL} if the Range header should be ignored.
+     * @param request  The servlet request we are processing
+     * @param response The servlet response we are creating
+     * @param resource The resource
+     *
+     * @return a list of ranges, {@code null} if the range header was invalid or {@code #FULL} if the Range header
+     *             should be ignored.
+     *
      * @throws IOException an IO error occurred
      */
-    protected ArrayList<Range> parseRange(HttpServletRequest request,
-            HttpServletResponse response,
+    protected ArrayList<Range> parseRange(HttpServletRequest request, HttpServletResponse response,
             WebResource resource) throws IOException {
 
         // Range headers are only valid on GET requests. That implies they are
@@ -1604,14 +1556,14 @@ public class DefaultServlet extends HttpServlet {
      *
      * @return the input stream with the rendered output
      *
-     * @throws IOException an IO error occurred
+     * @throws IOException      an IO error occurred
      * @throws ServletException rendering error
      *
      * @deprecated Use {@link #render(HttpServletRequest, String, WebResource, String)} instead
      */
     @Deprecated
     protected InputStream render(String contextPath, WebResource resource, String encoding)
-        throws IOException, ServletException {
+            throws IOException, ServletException {
 
         return render(null, contextPath, resource, encoding);
     }
@@ -1626,11 +1578,11 @@ public class DefaultServlet extends HttpServlet {
      *
      * @return the input stream with the rendered output
      *
-     * @throws IOException an IO error occurred
+     * @throws IOException      an IO error occurred
      * @throws ServletException rendering error
      */
     protected InputStream render(HttpServletRequest request, String contextPath, WebResource resource, String encoding)
-        throws IOException, ServletException {
+            throws IOException, ServletException {
 
         Source xsltSource = findXsltSource(resource);
 
@@ -1642,8 +1594,7 @@ public class DefaultServlet extends HttpServlet {
 
 
     /**
-     * Return an InputStream to an XML representation of the contents this
-     * directory.
+     * Return an InputStream to an XML representation of the contents this directory.
      *
      * @param contextPath Context path to which our internal paths are relative
      * @param resource    The associated resource
@@ -1652,22 +1603,20 @@ public class DefaultServlet extends HttpServlet {
      *
      * @return the XML data
      *
-     * @throws IOException an IO error occurred
+     * @throws IOException      an IO error occurred
      * @throws ServletException rendering error
+     *
      * @deprecated Unused. Will be removed in Tomcat 10
      * @deprecated Use {@link #render(HttpServletRequest, String, WebResource, String)} instead
      */
     @Deprecated
-    protected InputStream renderXml(String contextPath, WebResource resource, Source xsltSource,
-            String encoding)
-        throws ServletException, IOException
-    {
+    protected InputStream renderXml(String contextPath, WebResource resource, Source xsltSource, String encoding)
+            throws ServletException, IOException {
         return renderXml(null, contextPath, resource, xsltSource, encoding);
     }
 
     /**
-     * Return an InputStream to an XML representation of the contents this
-     * directory.
+     * Return an InputStream to an XML representation of the contents this directory.
      *
      * @param request     The HttpServletRequest being served
      * @param contextPath Context path to which our internal paths are relative
@@ -1677,12 +1626,11 @@ public class DefaultServlet extends HttpServlet {
      *
      * @return the XML data
      *
-     * @throws IOException an IO error occurred
+     * @throws IOException      an IO error occurred
      * @throws ServletException rendering error
      */
-    protected InputStream renderXml(HttpServletRequest request, String contextPath, WebResource resource, Source xsltSource,
-            String encoding)
-        throws IOException, ServletException {
+    protected InputStream renderXml(HttpServletRequest request, String contextPath, WebResource resource,
+            Source xsltSource, String encoding) throws IOException, ServletException {
 
         StringBuilder sb = new StringBuilder();
 
@@ -1702,13 +1650,12 @@ public class DefaultServlet extends HttpServlet {
         String[] entries = resources.list(resource.getWebappPath());
 
         // rewriteUrl(contextPath) is expensive. cache result for later reuse
-        String rewrittenContextPath =  rewriteUrl(contextPath);
+        String rewrittenContextPath = rewriteUrl(contextPath);
         String directoryWebappPath = resource.getWebappPath();
 
         for (String entry : entries) {
 
-            if (entry.equalsIgnoreCase("WEB-INF") ||
-                    entry.equalsIgnoreCase("META-INF") ||
+            if (entry.equalsIgnoreCase("WEB-INF") || entry.equalsIgnoreCase("META-INF") ||
                     entry.equalsIgnoreCase(localXsltFile)) {
                 continue;
             }
@@ -1717,32 +1664,21 @@ public class DefaultServlet extends HttpServlet {
                 continue;
             }
 
-            WebResource childResource =
-                    resources.getResource(directoryWebappPath + entry);
+            WebResource childResource = resources.getResource(directoryWebappPath + entry);
             if (!childResource.exists()) {
                 continue;
             }
 
             sb.append("<entry");
-            sb.append(" type='")
-              .append(childResource.isDirectory()?"dir":"file")
-              .append('\'');
-            sb.append(" urlPath='")
-              .append(rewrittenContextPath)
-              .append(Escape.xml(rewriteUrl(directoryWebappPath + entry)))
-              .append(childResource.isDirectory()?"/":"")
-              .append('\'');
+            sb.append(" type='").append(childResource.isDirectory() ? "dir" : "file").append('\'');
+            sb.append(" urlPath='").append(rewrittenContextPath)
+                    .append(Escape.xml(rewriteUrl(directoryWebappPath + entry)))
+                    .append(childResource.isDirectory() ? "/" : "").append('\'');
             if (childResource.isFile()) {
-                sb.append(" size='")
-                  .append(renderSize(childResource.getContentLength()))
-                  .append('\'');
+                sb.append(" size='").append(renderSize(childResource.getContentLength())).append('\'');
             }
-            sb.append(" date='")
-              .append(childResource.getLastModifiedHttp())
-              .append('\'');
-            sb.append(" longDate='")
-              .append(childResource.getLastModified())
-              .append('\'');
+            sb.append(" date='").append(childResource.getLastModifiedHttp()).append('\'');
+            sb.append(" longDate='").append(childResource.getLastModified()).append('\'');
 
             sb.append('>');
             sb.append(Escape.htmlElementContent(entry));
@@ -1755,7 +1691,7 @@ public class DefaultServlet extends HttpServlet {
 
         String readme = getReadme(resource, encoding);
 
-        if (readme!=null) {
+        if (readme != null) {
             sb.append("<readme><![CDATA[");
             sb.append(readme);
             sb.append("]]></readme>");
@@ -1778,8 +1714,7 @@ public class DefaultServlet extends HttpServlet {
                 PrivilegedSetTccl pa = new PrivilegedSetTccl(currentThread, DefaultServlet.class.getClassLoader());
                 AccessController.doPrivileged(pa);
             } else {
-                currentThread.setContextClassLoader(
-                        DefaultServlet.class.getClassLoader());
+                currentThread.setContextClassLoader(DefaultServlet.class.getClassLoader());
             }
 
             TransformerFactory tFactory = TransformerFactory.newInstance();
@@ -1805,8 +1740,7 @@ public class DefaultServlet extends HttpServlet {
     }
 
     /**
-     * Return an InputStream to an HTML representation of the contents of this
-     * directory.
+     * Return an InputStream to an HTML representation of the contents of this directory.
      *
      * @param contextPath Context path to which our internal paths are relative
      * @param resource    The associated resource
@@ -1820,14 +1754,12 @@ public class DefaultServlet extends HttpServlet {
      * @deprecated Use {@link #renderHtml(HttpServletRequest, String, WebResource, String)} instead
      */
     @Deprecated
-    protected InputStream renderHtml(String contextPath, WebResource resource, String encoding)
-        throws IOException {
+    protected InputStream renderHtml(String contextPath, WebResource resource, String encoding) throws IOException {
         return renderHtml(null, contextPath, resource, encoding);
     }
 
     /**
-     * Return an InputStream to an HTML representation of the contents of this
-     * directory.
+     * Return an InputStream to an HTML representation of the contents of this directory.
      *
      * @param request     The HttpServletRequest being served
      * @param contextPath Context path to which our internal paths are relative
@@ -1838,8 +1770,8 @@ public class DefaultServlet extends HttpServlet {
      *
      * @throws IOException an IO error occurred
      */
-    protected InputStream renderHtml(HttpServletRequest request, String contextPath, WebResource resource, String encoding)
-        throws IOException {
+    protected InputStream renderHtml(HttpServletRequest request, String contextPath, WebResource resource,
+            String encoding) throws IOException {
 
         // Prepare a writer to a buffered area
         ByteArrayOutputStream stream = new ByteArrayOutputStream();
@@ -1852,14 +1784,14 @@ public class DefaultServlet extends HttpServlet {
         WebResource[] entries = resources.listResources(directoryWebappPath);
 
         // rewriteUrl(contextPath) is expensive. cache result for later reuse
-        String rewrittenContextPath =  rewriteUrl(contextPath);
+        String rewrittenContextPath = rewriteUrl(contextPath);
 
         // Render the page header
         sb.append("<!doctype html><html>\r\n");
-        /* TODO Activate this as soon as we use smClient with the request locales
-        sb.append("<!doctype html><html lang=\"");
-        sb.append(smClient.getLocale().getLanguage()).append("\">\r\n");
-        */
+        /*
+         * TODO Activate this as soon as we use smClient with the request locales
+         * sb.append("<!doctype html><html lang=\""); sb.append(smClient.getLocale().getLanguage()).append("\">\r\n");
+         */
         sb.append("<head>\r\n");
         sb.append("<title>");
         sb.append(sm.getString("directory.title", directoryWebappPath));
@@ -1875,8 +1807,7 @@ public class DefaultServlet extends HttpServlet {
         // Render the link to our parent (if required)
         String parentDirectory = directoryWebappPath;
         if (parentDirectory.endsWith("/")) {
-            parentDirectory =
-                parentDirectory.substring(0, parentDirectory.length() - 1);
+            parentDirectory = parentDirectory.substring(0, parentDirectory.length() - 1);
         }
         int slash = parentDirectory.lastIndexOf('/');
         if (slash >= 0) {
@@ -1900,11 +1831,10 @@ public class DefaultServlet extends HttpServlet {
         sb.append("</h1>");
         sb.append("<hr class=\"line\">");
 
-        sb.append("<table width=\"100%\" cellspacing=\"0\"" +
-                     " cellpadding=\"5\" align=\"center\">\r\n");
+        sb.append("<table width=\"100%\" cellspacing=\"0\"" + " cellpadding=\"5\" align=\"center\">\r\n");
 
         SortManager.Order order;
-        if(sortListings && null != request) {
+        if (sortListings && null != request) {
             order = sortManager.getOrder(request.getQueryString());
         } else {
             order = null;
@@ -1912,7 +1842,7 @@ public class DefaultServlet extends HttpServlet {
         // Render the column headings
         sb.append("<tr>\r\n");
         sb.append("<td align=\"left\"><font size=\"+1\"><strong>");
-        if(sortListings && null != request) {
+        if (sortListings && null != request) {
             sb.append("<a href=\"?C=N;O=");
             sb.append(getOrderChar(order, 'N'));
             sb.append("\">");
@@ -1923,7 +1853,7 @@ public class DefaultServlet extends HttpServlet {
         }
         sb.append("</strong></font></td>\r\n");
         sb.append("<td align=\"center\"><font size=\"+1\"><strong>");
-        if(sortListings && null != request) {
+        if (sortListings && null != request) {
             sb.append("<a href=\"?C=S;O=");
             sb.append(getOrderChar(order, 'S'));
             sb.append("\">");
@@ -1934,7 +1864,7 @@ public class DefaultServlet extends HttpServlet {
         }
         sb.append("</strong></font></td>\r\n");
         sb.append("<td align=\"right\"><font size=\"+1\"><strong>");
-        if(sortListings && null != request) {
+        if (sortListings && null != request) {
             sb.append("<a href=\"?C=M;O=");
             sb.append(getOrderChar(order, 'M'));
             sb.append("\">");
@@ -1946,15 +1876,14 @@ public class DefaultServlet extends HttpServlet {
         sb.append("</strong></font></td>\r\n");
         sb.append("</tr>");
 
-        if(null != sortManager && null != request) {
+        if (null != sortManager && null != request) {
             sortManager.sort(entries, request.getQueryString());
         }
 
         boolean shade = false;
         for (WebResource childResource : entries) {
             String filename = childResource.getName();
-            if (filename.equalsIgnoreCase("WEB-INF") ||
-                filename.equalsIgnoreCase("META-INF")) {
+            if (filename.equalsIgnoreCase("WEB-INF") || filename.equalsIgnoreCase("META-INF")) {
                 continue;
             }
 
@@ -2004,7 +1933,7 @@ public class DefaultServlet extends HttpServlet {
         sb.append("<hr class=\"line\">");
 
         String readme = getReadme(resource, encoding);
-        if (readme!=null) {
+        if (readme != null) {
             sb.append(readme);
             sb.append("<hr class=\"line\">");
         }
@@ -2027,12 +1956,13 @@ public class DefaultServlet extends HttpServlet {
      * Render the specified file size (in bytes).
      *
      * @param size File size (in bytes)
+     *
      * @return the formatted size
      */
     protected String renderSize(long size) {
 
         long leftSide = size / 1024;
-        long rightSide = (size % 1024) / 103;   // Makes 1 digit
+        long rightSide = (size % 1024) / 103; // Makes 1 digit
         if ((leftSide == 0) && (rightSide == 0) && (size > 0)) {
             rightSide = 1;
         }
@@ -2044,19 +1974,20 @@ public class DefaultServlet extends HttpServlet {
 
     /**
      * Get the readme file as a string.
+     *
      * @param directory The directory to search
-     * @param encoding The readme encoding
+     * @param encoding  The readme encoding
+     *
      * @return the readme for the specified directory
      */
     protected String getReadme(WebResource directory, String encoding) {
 
         if (readmeFile != null) {
-            WebResource resource = resources.getResource(
-                    directory.getWebappPath() + readmeFile);
+            WebResource resource = resources.getResource(directory.getWebappPath() + readmeFile);
             if (resource.isFile()) {
                 StringWriter buffer = new StringWriter();
                 InputStreamReader reader = null;
-                try (InputStream is = resource.getInputStream()){
+                try (InputStream is = resource.getInputStream()) {
                     if (encoding != null) {
                         reader = new InputStreamReader(is, encoding);
                     } else {
@@ -2089,16 +2020,17 @@ public class DefaultServlet extends HttpServlet {
 
     /**
      * Return a Source for the xsl template (if possible).
+     *
      * @param directory The directory to search
+     *
      * @return the source for the specified directory
+     *
      * @throws IOException an IO error occurred
      */
-    protected Source findXsltSource(WebResource directory)
-        throws IOException {
+    protected Source findXsltSource(WebResource directory) throws IOException {
 
         if (localXsltFile != null) {
-            WebResource resource = resources.getResource(
-                    directory.getWebappPath() + localXsltFile);
+            WebResource resource = resources.getResource(directory.getWebappPath() + localXsltFile);
             if (resource.isFile()) {
                 InputStream is = resource.getInputStream();
                 if (is != null) {
@@ -2115,8 +2047,7 @@ public class DefaultServlet extends HttpServlet {
         }
 
         if (contextXsltFile != null) {
-            InputStream is =
-                getServletContext().getResourceAsStream(contextXsltFile);
+            InputStream is = getServletContext().getResourceAsStream(contextXsltFile);
             if (is != null) {
                 if (Globals.IS_SECURITY_ENABLED) {
                     return secureXslt(is);
@@ -2130,8 +2061,8 @@ public class DefaultServlet extends HttpServlet {
             }
         }
 
-        /*  Open and read in file in one fell swoop to reduce chance
-         *  chance of leaving handle open.
+        /*
+         * Open and read in file in one fell swoop to reduce chance chance of leaving handle open.
          */
         if (globalXsltFile != null) {
             File f = validateGlobalXsltFile();
@@ -2140,8 +2071,8 @@ public class DefaultServlet extends HttpServlet {
                 if (globalXsltFileSize > Integer.MAX_VALUE) {
                     log("globalXsltFile [" + f.getAbsolutePath() + "] is too big to buffer");
                 } else {
-                    try (FileInputStream fis = new FileInputStream(f)){
-                        byte b[] = new byte[(int)f.length()];
+                    try (FileInputStream fis = new FileInputStream(f)) {
+                        byte b[] = new byte[(int) f.length()];
                         IOTools.readFully(fis, b);
                         return new StreamSource(new ByteArrayInputStream(b));
                     }
@@ -2227,28 +2158,23 @@ public class DefaultServlet extends HttpServlet {
 
     /**
      * Check if sendfile can be used.
-     * @param request The Servlet request
+     *
+     * @param request  The Servlet request
      * @param response The Servlet response
      * @param resource The resource
-     * @param length The length which will be written (will be used only if
-     *  range is null)
-     * @param range The range that will be written
-     * @return <code>true</code> if sendfile should be used (writing is then
-     *  delegated to the endpoint)
+     * @param length   The length which will be written (will be used only if range is null)
+     * @param range    The range that will be written
+     *
+     * @return <code>true</code> if sendfile should be used (writing is then delegated to the endpoint)
      */
-    protected boolean checkSendfile(HttpServletRequest request,
-                                  HttpServletResponse response,
-                                  WebResource resource,
-                                  long length, Range range) {
+    protected boolean checkSendfile(HttpServletRequest request, HttpServletResponse response, WebResource resource,
+            long length, Range range) {
         String canonicalPath;
-        if (sendfileSize > 0
-            && length > sendfileSize
-            && (Boolean.TRUE.equals(request.getAttribute(Globals.SENDFILE_SUPPORTED_ATTR)))
-            && (request.getClass().getName().equals("org.apache.catalina.connector.RequestFacade"))
-            && (response.getClass().getName().equals("org.apache.catalina.connector.ResponseFacade"))
-            && resource.isFile()
-            && ((canonicalPath = resource.getCanonicalPath()) != null)
-            ) {
+        if (sendfileSize > 0 && length > sendfileSize &&
+                (Boolean.TRUE.equals(request.getAttribute(Globals.SENDFILE_SUPPORTED_ATTR))) &&
+                (request.getClass().getName().equals("org.apache.catalina.connector.RequestFacade")) &&
+                (response.getClass().getName().equals("org.apache.catalina.connector.ResponseFacade")) &&
+                resource.isFile() && ((canonicalPath = resource.getCanonicalPath()) != null)) {
             request.setAttribute(Globals.SENDFILE_FILENAME_ATTR, canonicalPath);
             if (range == null) {
                 request.setAttribute(Globals.SENDFILE_FILE_START_ATTR, Long.valueOf(0L));
@@ -2266,12 +2192,13 @@ public class DefaultServlet extends HttpServlet {
     /**
      * Check if the if-match condition is satisfied.
      *
-     * @param request   The servlet request we are processing
-     * @param response  The servlet response we are creating
-     * @param resource  The resource
-     * @return <code>true</code> if the resource meets the specified condition,
-     *  and <code>false</code> if the condition is not satisfied, in which case
-     *  request processing is stopped
+     * @param request  The servlet request we are processing
+     * @param response The servlet response we are creating
+     * @param resource The resource
+     *
+     * @return <code>true</code> if the resource meets the specified condition, and <code>false</code> if the condition
+     *             is not satisfied, in which case request processing is stopped
+     *
      * @throws IOException an IO error occurred
      */
     protected boolean checkIfMatch(HttpServletRequest request, HttpServletResponse response, WebResource resource)
@@ -2314,15 +2241,15 @@ public class DefaultServlet extends HttpServlet {
     /**
      * Check if the if-modified-since condition is satisfied.
      *
-     * @param request   The servlet request we are processing
-     * @param response  The servlet response we are creating
-     * @param resource  The resource
-     * @return <code>true</code> if the resource meets the specified condition,
-     *  and <code>false</code> if the condition is not satisfied, in which case
-     *  request processing is stopped
+     * @param request  The servlet request we are processing
+     * @param response The servlet response we are creating
+     * @param resource The resource
+     *
+     * @return <code>true</code> if the resource meets the specified condition, and <code>false</code> if the condition
+     *             is not satisfied, in which case request processing is stopped
      */
-    protected boolean checkIfModifiedSince(HttpServletRequest request,
-            HttpServletResponse response, WebResource resource) {
+    protected boolean checkIfModifiedSince(HttpServletRequest request, HttpServletResponse response,
+            WebResource resource) {
         try {
             long headerValue = request.getDateHeader("If-Modified-Since");
             long lastModified = resource.getLastModified();
@@ -2330,8 +2257,7 @@ public class DefaultServlet extends HttpServlet {
 
                 // If an If-None-Match header has been specified, if modified since
                 // is ignored.
-                if ((request.getHeader("If-None-Match") == null)
-                    && (lastModified < headerValue + 1000)) {
+                if ((request.getHeader("If-None-Match") == null) && (lastModified < headerValue + 1000)) {
                     // The entity has not been modified since the date
                     // specified by the client. This is not an error case.
                     response.setStatus(HttpServletResponse.SC_NOT_MODIFIED);
@@ -2350,12 +2276,13 @@ public class DefaultServlet extends HttpServlet {
     /**
      * Check if the if-none-match condition is satisfied.
      *
-     * @param request   The servlet request we are processing
-     * @param response  The servlet response we are creating
-     * @param resource  The resource
-     * @return <code>true</code> if the resource meets the specified condition,
-     *  and <code>false</code> if the condition is not satisfied, in which case
-     *  request processing is stopped
+     * @param request  The servlet request we are processing
+     * @param response The servlet response we are creating
+     * @param resource The resource
+     *
+     * @return <code>true</code> if the resource meets the specified condition, and <code>false</code> if the condition
+     *             is not satisfied, in which case request processing is stopped
+     *
      * @throws IOException an IO error occurred
      */
     protected boolean checkIfNoneMatch(HttpServletRequest request, HttpServletResponse response, WebResource resource)
@@ -2407,29 +2334,29 @@ public class DefaultServlet extends HttpServlet {
     /**
      * Check if the if-unmodified-since condition is satisfied.
      *
-     * @param request   The servlet request we are processing
-     * @param response  The servlet response we are creating
-     * @param resource  The resource
-     * @return <code>true</code> if the resource meets the specified condition,
-     *  and <code>false</code> if the condition is not satisfied, in which case
-     *  request processing is stopped
+     * @param request  The servlet request we are processing
+     * @param response The servlet response we are creating
+     * @param resource The resource
+     *
+     * @return <code>true</code> if the resource meets the specified condition, and <code>false</code> if the condition
+     *             is not satisfied, in which case request processing is stopped
+     *
      * @throws IOException an IO error occurred
      */
-    protected boolean checkIfUnmodifiedSince(HttpServletRequest request,
-            HttpServletResponse response, WebResource resource)
-            throws IOException {
+    protected boolean checkIfUnmodifiedSince(HttpServletRequest request, HttpServletResponse response,
+            WebResource resource) throws IOException {
         try {
             long lastModified = resource.getLastModified();
             long headerValue = request.getDateHeader("If-Unmodified-Since");
             if (headerValue != -1) {
-                if ( lastModified >= (headerValue + 1000)) {
+                if (lastModified >= (headerValue + 1000)) {
                     // The entity has not been modified since the date
                     // specified by the client. This is not an error case.
                     response.sendError(HttpServletResponse.SC_PRECONDITION_FAILED);
                     return false;
                 }
             }
-        } catch(IllegalArgumentException illegalArgument) {
+        } catch (IllegalArgumentException illegalArgument) {
             return true;
         }
         return true;
@@ -2437,14 +2364,12 @@ public class DefaultServlet extends HttpServlet {
 
 
     /**
-     * Provides the entity tag (the ETag header) for the given resource.
-     * Intended to be over-ridden by custom DefaultServlet implementations that
-     * wish to use an alternative format for the entity tag.
+     * Provides the entity tag (the ETag header) for the given resource. Intended to be over-ridden by custom
+     * DefaultServlet implementations that wish to use an alternative format for the entity tag.
      *
-     * @param resource  The resource for which an entity tag is required.
+     * @param resource The resource for which an entity tag is required.
      *
-     * @return The result of calling {@link WebResource#getETag()} on the given
-     *         resource
+     * @return The result of calling {@link WebResource#getETag()} on the given resource
      */
     protected String generateETag(WebResource resource) {
         return resource.getETag();
@@ -2452,12 +2377,11 @@ public class DefaultServlet extends HttpServlet {
 
 
     /**
-     * Copy the contents of the specified input stream to the specified
-     * output stream, and ensure that both streams are closed before returning
-     * (even in the face of an exception).
+     * Copy the contents of the specified input stream to the specified output stream, and ensure that both streams are
+     * closed before returning (even in the face of an exception).
      *
-     * @param is        The input stream to read the source resource from
-     * @param ostream   The output stream to write to
+     * @param is      The input stream to read the source resource from
+     * @param ostream The output stream to write to
      *
      * @exception IOException if an input/output error occurs
      */
@@ -2480,13 +2404,12 @@ public class DefaultServlet extends HttpServlet {
 
 
     /**
-     * Copy the contents of the specified input stream to the specified
-     * output stream, and ensure that both streams are closed before returning
-     * (even in the face of an exception).
+     * Copy the contents of the specified input stream to the specified output stream, and ensure that both streams are
+     * closed before returning (even in the face of an exception).
      *
-     * @param is        The input stream to read the source resource from
-     * @param writer    The writer to write to
-     * @param encoding  The encoding to use when reading the source input stream
+     * @param is       The input stream to read the source resource from
+     * @param writer   The writer to write to
+     * @param encoding The encoding to use when reading the source input stream
      *
      * @exception IOException if an input/output error occurs
      */
@@ -2514,24 +2437,21 @@ public class DefaultServlet extends HttpServlet {
 
 
     /**
-     * Copy the contents of the specified input stream to the specified
-     * output stream, and ensure that both streams are closed before returning
-     * (even in the face of an exception).
+     * Copy the contents of the specified input stream to the specified output stream, and ensure that both streams are
+     * closed before returning (even in the face of an exception).
+     *
+     * @param resource The source resource
+     * @param ostream  The output stream to write to
+     * @param range    Range the client wanted to retrieve
      *
-     * @param resource  The source resource
-     * @param ostream   The output stream to write to
-     * @param range     Range the client wanted to retrieve
      * @exception IOException if an input/output error occurs
      */
-    protected void copy(WebResource resource, ServletOutputStream ostream,
-                      Range range)
-        throws IOException {
+    protected void copy(WebResource resource, ServletOutputStream ostream, Range range) throws IOException {
 
         IOException exception = null;
 
         InputStream resourceInputStream = resource.getInputStream();
-        InputStream istream =
-            new BufferedInputStream(resourceInputStream, input);
+        InputStream istream = new BufferedInputStream(resourceInputStream, input);
         exception = copyRange(istream, ostream, range.start, range.end);
 
         // Clean up the input stream
@@ -2546,24 +2466,22 @@ public class DefaultServlet extends HttpServlet {
 
 
     /**
-     * Copy the contents of the specified input stream to the specified
-     * output stream, and ensure that both streams are closed before returning
-     * (even in the face of an exception).
+     * Copy the contents of the specified input stream to the specified output stream, and ensure that both streams are
+     * closed before returning (even in the face of an exception).
+     *
+     * @param resource    The source resource
+     * @param ostream     The output stream to write to
+     * @param ranges      Enumeration of the ranges the client wanted to retrieve
+     * @param contentType Content type of the resource
      *
-     * @param resource      The source resource
-     * @param ostream       The output stream to write to
-     * @param ranges        Enumeration of the ranges the client wanted to
-     *                          retrieve
-     * @param contentType   Content type of the resource
      * @exception IOException if an input/output error occurs
      */
-    protected void copy(WebResource resource, ServletOutputStream ostream,
-                      Iterator<Range> ranges, String contentType)
-        throws IOException {
+    protected void copy(WebResource resource, ServletOutputStream ostream, Iterator<Range> ranges, String contentType)
+            throws IOException {
 
         IOException exception = null;
 
-        while ( (exception == null) && (ranges.hasNext()) ) {
+        while ((exception == null) && (ranges.hasNext())) {
 
             InputStream resourceInputStream = resource.getInputStream();
             try (InputStream istream = new BufferedInputStream(resourceInputStream, input)) {
@@ -2576,14 +2494,12 @@ public class DefaultServlet extends HttpServlet {
                 if (contentType != null) {
                     ostream.println("Content-Type: " + contentType);
                 }
-                ostream.println("Content-Range: bytes " + currentRange.start
-                               + "-" + currentRange.end + "/"
-                               + currentRange.length);
+                ostream.println("Content-Range: bytes " + currentRange.start + "-" + currentRange.end + "/" +
+                        currentRange.length);
                 ostream.println();
 
                 // Printing content
-                exception = copyRange(istream, ostream, currentRange.start,
-                                      currentRange.end);
+                exception = copyRange(istream, ostream, currentRange.start, currentRange.end);
             }
         }
 
@@ -2599,16 +2515,15 @@ public class DefaultServlet extends HttpServlet {
 
 
     /**
-     * Copy the contents of the specified input stream to the specified
-     * output stream, and ensure that both streams are closed before returning
-     * (even in the face of an exception).
+     * Copy the contents of the specified input stream to the specified output stream, and ensure that both streams are
+     * closed before returning (even in the face of an exception).
      *
      * @param istream The input stream to read from
      * @param ostream The output stream to write to
+     *
      * @return Exception which occurred during processing
      */
-    protected IOException copyRange(InputStream istream,
-                                  ServletOutputStream ostream) {
+    protected IOException copyRange(InputStream istream, ServletOutputStream ostream) {
 
         // Copy the input stream to the output stream
         IOException exception = null;
@@ -2633,12 +2548,12 @@ public class DefaultServlet extends HttpServlet {
 
 
     /**
-     * Copy the contents of the specified input stream to the specified
-     * output stream, and ensure that both streams are closed before returning
-     * (even in the face of an exception).
+     * Copy the contents of the specified input stream to the specified output stream, and ensure that both streams are
+     * closed before returning (even in the face of an exception).
      *
      * @param reader The reader to read from
      * @param writer The writer to write to
+     *
      * @return Exception which occurred during processing
      */
     protected IOException copyRange(Reader reader, PrintWriter writer) {
@@ -2666,19 +2581,17 @@ public class DefaultServlet extends HttpServlet {
 
 
     /**
-     * Copy the contents of the specified input stream to the specified
-     * output stream, and ensure that both streams are closed before returning
-     * (even in the face of an exception).
+     * Copy the contents of the specified input stream to the specified output stream, and ensure that both streams are
+     * closed before returning (even in the face of an exception).
      *
      * @param istream The input stream to read from
      * @param ostream The output stream to write to
-     * @param start Start of the range which will be copied
-     * @param end End of the range which will be copied
+     * @param start   Start of the range which will be copied
+     * @param end     End of the range which will be copied
+     *
      * @return Exception which occurred during processing
      */
-    protected IOException copyRange(InputStream istream,
-                                  ServletOutputStream ostream,
-                                  long start, long end) {
+    protected IOException copyRange(InputStream istream, ServletOutputStream ostream, long start, long end) {
 
         if (debug > 10) {
             log("Serving bytes:" + start + "-" + end);
@@ -2691,8 +2604,7 @@ public class DefaultServlet extends HttpServlet {
             return e;
         }
         if (skipped < start) {
-            return new IOException(sm.getString("defaultServlet.skipfail",
-                    Long.valueOf(skipped), Long.valueOf(start)));
+            return new IOException(sm.getString("defaultServlet.skipfail", Long.valueOf(skipped), Long.valueOf(start)));
         }
 
         IOException exception = null;
@@ -2700,7 +2612,7 @@ public class DefaultServlet extends HttpServlet {
 
         byte buffer[] = new byte[input];
         int len = buffer.length;
-        while ( (bytesToRead > 0) && (len >= buffer.length)) {
+        while ((bytesToRead > 0) && (len >= buffer.length)) {
             try {
                 len = istream.read(buffer);
                 if (bytesToRead >= len) {
@@ -2767,31 +2679,25 @@ public class DefaultServlet extends HttpServlet {
 
 
     /**
-     * This is secure in the sense that any attempt to use an external entity
-     * will trigger an exception.
+     * This is secure in the sense that any attempt to use an external entity will trigger an exception.
      */
-    private static class SecureEntityResolver implements EntityResolver2  {
+    private static class SecureEntityResolver implements EntityResolver2 {
 
         @Override
-        public InputSource resolveEntity(String publicId, String systemId)
-                throws SAXException, IOException {
-            throw new SAXException(sm.getString("defaultServlet.blockExternalEntity",
-                    publicId, systemId));
+        public InputSource resolveEntity(String publicId, String systemId) throws SAXException, IOException {
+            throw new SAXException(sm.getString("defaultServlet.blockExternalEntity", publicId, systemId));
         }
 
         @Override
-        public InputSource getExternalSubset(String name, String baseURI)
-                throws SAXException, IOException {
-            throw new SAXException(sm.getString("defaultServlet.blockExternalSubset",
-                    name, baseURI));
+        public InputSource getExternalSubset(String name, String baseURI) throws SAXException, IOException {
+            throw new SAXException(sm.getString("defaultServlet.blockExternalSubset", name, baseURI));
         }
 
         @Override
-        public InputSource resolveEntity(String name, String publicId,
-                String baseURI, String systemId) throws SAXException,
-                IOException {
-            throw new SAXException(sm.getString("defaultServlet.blockExternalEntity2",
-                    name, publicId, baseURI, systemId));
+        public InputSource resolveEntity(String name, String publicId, String baseURI, String systemId)
+                throws SAXException, IOException {
+            throw new SAXException(
+                    sm.getString("defaultServlet.blockExternalEntity2", name, publicId, baseURI, systemId));
         }
     }
 
@@ -2802,12 +2708,11 @@ public class DefaultServlet extends HttpServlet {
      * @param order  The order that is currently being applied
      * @param column The column that will be rendered.
      *
-     * @return Either 'A' or 'D', to indicate "ascending" or "descending" sort
-     *         order.
+     * @return Either 'A' or 'D', to indicate "ascending" or "descending" sort order.
      */
     private char getOrderChar(SortManager.Order order, char column) {
-        if(column == order.column) {
-            if(order.ascending) {
+        if (column == order.column) {
+            if (order.ascending) {
                 return 'D';
             } else {
                 return 'A';
@@ -2891,7 +2796,7 @@ public class DefaultServlet extends HttpServlet {
         public void sort(WebResource[] resources, String order) {
             Comparator<WebResource> comparator = getComparator(order);
 
-            if(null != comparator) {
+            if (null != comparator) {
                 Arrays.sort(resources, comparator);
             }
         }
@@ -2901,28 +2806,28 @@ public class DefaultServlet extends HttpServlet {
         }
 
         public Comparator<WebResource> getComparator(Order order) {
-            if(null == order) {
+            if (null == order) {
                 return defaultResourceComparator;
             }
 
-            if('N' == order.column) {
-                if(order.ascending) {
+            if ('N' == order.column) {
+                if (order.ascending) {
                     return resourceNameComparatorAsc;
                 } else {
                     return resourceNameComparator;
                 }
             }
 
-            if('S' == order.column) {
-                if(order.ascending) {
+            if ('S' == order.column) {
+                if (order.ascending) {
                     return resourceSizeComparatorAsc;
                 } else {
                     return resourceSizeComparator;
                 }
             }
 
-            if('M' == order.column) {
-                if(order.ascending) {
+            if ('M' == order.column) {
+                if (order.ascending) {
                     return resourceLastModifiedComparatorAsc;
                 } else {
                     return resourceLastModifiedComparator;
@@ -2933,61 +2838,59 @@ public class DefaultServlet extends HttpServlet {
         }
 
         /**
-         * Gets the Order to apply given an ordering-string. This
-         * ordering-string matches a subset of the ordering-strings
-         * supported by
-         * <a href="https://httpd.apache.org/docs/2.4/mod/mod_autoindex.html#query">Apache httpd</a>.
+         * Gets the Order to apply given an ordering-string. This ordering-string matches a subset of the
+         * ordering-strings supported by <a href="https://httpd.apache.org/docs/2.4/mod/mod_autoindex.html#query">Apache
+         * httpd</a>.
          *
          * @param order The ordering-string provided by the client.
          *
-         * @return An Order specifying the column and ascending/descending to
-         *         be applied to resources.
+         * @return An Order specifying the column and ascending/descending to be applied to resources.
          */
         public Order getOrder(String order) {
-            if(null == order || 0 == order.trim().length()) {
+            if (null == order || 0 == order.trim().length()) {
                 return Order.DEFAULT;
             }
 
             String[] options = order.split(";");
 
-            if(0 == options.length) {
+            if (0 == options.length) {
                 return Order.DEFAULT;
             }
 
             char column = '\0';
             boolean ascending = false;
 
-            for(String option : options) {
+            for (String option : options) {
                 option = option.trim();
 
-                if(2 < option.length()) {
+                if (2 < option.length()) {
                     char opt = option.charAt(0);
-                    if('C' == opt) {
+                    if ('C' == opt) {
                         column = option.charAt(2);
-                    } else if('O' == opt) {
+                    } else if ('O' == opt) {
                         ascending = ('A' == option.charAt(2));
                     }
                 }
             }
 
-            if('N' == column) {
-                if(ascending) {
+            if ('N' == column) {
+                if (ascending) {
                     return Order.NAME_ASC;
                 } else {
                     return Order.NAME;
                 }
             }
 
-            if('S' == column) {
-                if(ascending) {
+            if ('S' == column) {
+                if (ascending) {
                     return Order.SIZE_ASC;
                 } else {
                     return Order.SIZE;
                 }
             }
 
-            if('M' == column) {
-                if(ascending) {
+            if ('M' == column) {
+                if (ascending) {
                     return Order.LAST_MODIFIED_ASC;
                 } else {
                     return Order.LAST_MODIFIED;
@@ -3039,18 +2942,15 @@ public class DefaultServlet extends HttpServlet {
 
     enum BomConfig {
         /**
-         * BoM is stripped if present and any BoM found used to determine the
-         * encoding used to read the resource.
+         * BoM is stripped if present and any BoM found used to determine the encoding used to read the resource.
          */
         TRUE("true", true, true),
         /**
-         * BoM is stripped if present but the configured file encoding is used
-         * to read the resource.
+         * BoM is stripped if present but the configured file encoding is used to read the resource.
          */
         FALSE("false", true, false),
         /**
-         * BoM is not stripped and the configured file encoding is used to read
-         * the resource.
+         * BoM is not stripped and the configured file encoding is used to read the resource.
          */
         PASS_THROUGH("pass-through", false, false);
 
diff --git a/java/org/apache/catalina/servlets/WebdavServlet.java b/java/org/apache/catalina/servlets/WebdavServlet.java
index 457ab2a25d..24cee4c999 100644
--- a/java/org/apache/catalina/servlets/WebdavServlet.java
+++ b/java/org/apache/catalina/servlets/WebdavServlet.java
@@ -66,19 +66,17 @@ import org.xml.sax.InputSource;
 import org.xml.sax.SAXException;
 
 /**
- * Servlet which adds support for
- * <a href="https://tools.ietf.org/html/rfc4918">WebDAV</a>
- * <a href="https://tools.ietf.org/html/rfc4918#section-18">level 2</a>.
- * All the basic HTTP requests
- * are handled by the DefaultServlet. The WebDAVServlet must not be used as the
- * default servlet (ie mapped to '/') as it will not work in this configuration.
+ * Servlet which adds support for <a href="https://tools.ietf.org/html/rfc4918">WebDAV</a>
+ * <a href="https://tools.ietf.org/html/rfc4918#section-18">level 2</a>. All the basic HTTP requests are handled by the
+ * DefaultServlet. The WebDAVServlet must not be used as the default servlet (ie mapped to '/') as it will not work in
+ * this configuration.
  * <p>
- * Mapping a subpath (e.g. <code>/webdav/*</code> to this servlet has the effect
- * of re-mounting the entire web application under that sub-path, with WebDAV
- * access to all the resources. The <code>WEB-INF</code> and <code>META-INF</code>
- * directories are protected in this re-mounted resource tree.
+ * Mapping a subpath (e.g. <code>/webdav/*</code> to this servlet has the effect of re-mounting the entire web
+ * application under that sub-path, with WebDAV access to all the resources. The <code>WEB-INF</code> and
+ * <code>META-INF</code> directories are protected in this re-mounted resource tree.
  * <p>
  * To enable WebDAV for a context add the following to web.xml:
+ *
  * <pre>
  * &lt;servlet&gt;
  *  &lt;servlet-name&gt;webdav&lt;/servlet-name&gt;
@@ -97,34 +95,37 @@ import org.xml.sax.SAXException;
  *    &lt;url-pattern&gt;/*&lt;/url-pattern&gt;
  *  &lt;/servlet-mapping&gt;
  * </pre>
+ *
  * This will enable read only access. To enable read-write access add:
+ *
  * <pre>
  *  &lt;init-param&gt;
  *    &lt;param-name&gt;readonly&lt;/param-name&gt;
  *    &lt;param-value&gt;false&lt;/param-value&gt;
  *  &lt;/init-param&gt;
  * </pre>
- * To make the content editable via a different URL, use the following
- * mapping:
+ *
+ * To make the content editable via a different URL, use the following mapping:
+ *
  * <pre>
  *  &lt;servlet-mapping&gt;
  *    &lt;servlet-name&gt;webdav&lt;/servlet-name&gt;
  *    &lt;url-pattern&gt;/webdavedit/*&lt;/url-pattern&gt;
  *  &lt;/servlet-mapping&gt;
  * </pre>
- * By default access to /WEB-INF and META-INF are not available via WebDAV. To
- * enable access to these URLs, use add:
+ *
+ * By default access to /WEB-INF and META-INF are not available via WebDAV. To enable access to these URLs, use add:
+ *
  * <pre>
  *  &lt;init-param&gt;
  *    &lt;param-name&gt;allowSpecialPaths&lt;/param-name&gt;
  *    &lt;param-value&gt;true&lt;/param-value&gt;
  *  &lt;/init-param&gt;
  * </pre>
- * Don't forget to secure access appropriately to the editing URLs, especially
- * if allowSpecialPaths is used. With the mapping configuration above, the
- * context will be accessible to normal users as before. Those users with the
- * necessary access will be able to edit content available via
- * http://host:port/context/content using
+ *
+ * Don't forget to secure access appropriately to the editing URLs, especially if allowSpecialPaths is used. With the
+ * mapping configuration above, the context will be accessible to normal users as before. Those users with the necessary
+ * access will be able to edit content available via http://host:port/context/content using
  * http://host:port/context/webdavedit/content
  *
  * @author Remy Maucherat
@@ -198,8 +199,8 @@ public class WebdavServlet extends DefaultServlet {
     /**
      * Simple date format for the creation date ISO representation (partial).
      */
-    protected static final ConcurrentDateFormat creationDateFormat = new ConcurrentDateFormat(
-            "yyyy-MM-dd'T'HH:mm:ss'Z'", Locale.US, TimeZone.getTimeZone("GMT"));
+    protected static final ConcurrentDateFormat creationDateFormat =
+            new ConcurrentDateFormat("yyyy-MM-dd'T'HH:mm:ss'Z'", Locale.US, TimeZone.getTimeZone("GMT"));
 
 
     // ----------------------------------------------------- Instance Variables
@@ -217,9 +218,8 @@ public class WebdavServlet extends DefaultServlet {
      * Repository of the lock-null resources.
      * <p>
      * Key : path of the collection containing the lock-null resource<br>
-     * Value : List of lock-null resource which are members of the
-     * collection. Each element of the List is the path associated with
-     * the lock-null resource.
+     * Value : List of lock-null resource which are members of the collection. Each element of the List is the path
+     * associated with the lock-null resource.
      */
     private final Map<String,List<String>> lockNullResources = new ConcurrentHashMap<>();
 
@@ -237,15 +237,13 @@ public class WebdavServlet extends DefaultServlet {
 
 
     /**
-     * Default depth in spec is infinite. Limit depth to 3 by default as
-     * infinite depth makes operations very expensive.
+     * Default depth in spec is infinite. Limit depth to 3 by default as infinite depth makes operations very expensive.
      */
     private int maxDepth = 3;
 
 
     /**
-     * Is access allowed via WebDAV to the special paths (/WEB-INF and
-     * /META-INF)?
+     * Is access allowed via WebDAV to the special paths (/WEB-INF and /META-INF)?
      */
     private boolean allowSpecialPaths = false;
 
@@ -265,13 +263,11 @@ public class WebdavServlet extends DefaultServlet {
         }
 
         if (getServletConfig().getInitParameter("maxDepth") != null) {
-            maxDepth = Integer.parseInt(
-                    getServletConfig().getInitParameter("maxDepth"));
+            maxDepth = Integer.parseInt(getServletConfig().getInitParameter("maxDepth"));
         }
 
         if (getServletConfig().getInitParameter("allowSpecialPaths") != null) {
-            allowSpecialPaths = Boolean.parseBoolean(
-                    getServletConfig().getInitParameter("allowSpecialPaths"));
+            allowSpecialPaths = Boolean.parseBoolean(getServletConfig().getInitParameter("allowSpecialPaths"));
         }
     }
 
@@ -280,9 +276,11 @@ public class WebdavServlet extends DefaultServlet {
 
     /**
      * Return JAXP document builder instance.
+     *
      * @return the document builder
-     * @throws ServletException document builder creation failed
-     *  (wrapped <code>ParserConfigurationException</code> exception)
+     *
+     * @throws ServletException document builder creation failed (wrapped <code>ParserConfigurationException</code>
+     *                              exception)
      */
     protected DocumentBuilder getDocumentBuilder() throws ServletException {
         DocumentBuilder documentBuilder = null;
@@ -293,7 +291,7 @@ public class WebdavServlet extends DefaultServlet {
             documentBuilderFactory.setExpandEntityReferences(false);
             documentBuilder = documentBuilderFactory.newDocumentBuilder();
             documentBuilder.setEntityResolver(new WebdavResolver(this.getServletContext()));
-        } catch(ParserConfigurationException e) {
+        } catch (ParserConfigurationException e) {
             throw new ServletException(sm.getString("webdavservlet.jaxpfailed"));
         }
         return documentBuilder;
@@ -354,14 +352,14 @@ public class WebdavServlet extends DefaultServlet {
 
 
     /**
-     * Checks whether a given path refers to a resource under
-     * <code>WEB-INF</code> or <code>META-INF</code>.
+     * Checks whether a given path refers to a resource under <code>WEB-INF</code> or <code>META-INF</code>.
+     *
      * @param path the full path of the resource being accessed
+     *
      * @return <code>true</code> if the resource specified is under a special path
      */
     private boolean isSpecialPath(final String path) {
-        return !allowSpecialPaths && (
-                path.toUpperCase(Locale.ENGLISH).startsWith("/WEB-INF") ||
+        return !allowSpecialPaths && (path.toUpperCase(Locale.ENGLISH).startsWith("/WEB-INF") ||
                 path.toUpperCase(Locale.ENGLISH).startsWith("/META-INF"));
     }
 
@@ -380,10 +378,9 @@ public class WebdavServlet extends DefaultServlet {
 
 
     /**
-     * Override the DefaultServlet implementation and only use the PathInfo. If
-     * the ServletPath is non-null, it will be because the WebDAV servlet has
-     * been mapped to a url other than /* to configure editing at different url
-     * than normal viewing.
+     * Override the DefaultServlet implementation and only use the PathInfo. If the ServletPath is non-null, it will be
+     * because the WebDAV servlet has been mapped to a url other than /* to configure editing at different url than
+     * normal viewing.
      *
      * @param request The servlet request we are processing
      */
@@ -422,7 +419,7 @@ public class WebdavServlet extends DefaultServlet {
     protected String getPathPrefix(final HttpServletRequest request) {
         // Repeat the servlet path (e.g. /webdav/) in the listing path
         String contextPath = request.getContextPath();
-        if (request.getServletPath() !=  null) {
+        if (request.getServletPath() != null) {
             contextPath = contextPath + request.getServletPath();
         }
         return contextPath;
@@ -432,10 +429,11 @@ public class WebdavServlet extends DefaultServlet {
     /**
      * OPTIONS Method.
      *
-     * @param req The Servlet request
+     * @param req  The Servlet request
      * @param resp The Servlet response
+     *
      * @throws ServletException If an error occurs
-     * @throws IOException If an IO error occurs
+     * @throws IOException      If an IO error occurs
      */
     @Override
     protected void doOptions(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
@@ -447,10 +445,12 @@ public class WebdavServlet extends DefaultServlet {
 
     /**
      * PROPFIND Method.
-     * @param req The Servlet request
+     *
+     * @param req  The Servlet request
      * @param resp The Servlet response
+     *
      * @throws ServletException If an error occurs
-     * @throws IOException If an IO error occurs
+     * @throws IOException      If an IO error occurs
      */
     protected void doPropfind(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
 
@@ -497,23 +497,23 @@ public class WebdavServlet extends DefaultServlet {
                 Element rootElement = document.getDocumentElement();
                 NodeList childList = rootElement.getChildNodes();
 
-                for (int i=0; i < childList.getLength(); i++) {
+                for (int i = 0; i < childList.getLength(); i++) {
                     Node currentNode = childList.item(i);
                     switch (currentNode.getNodeType()) {
-                    case Node.TEXT_NODE:
-                        break;
-                    case Node.ELEMENT_NODE:
-                        if (currentNode.getNodeName().endsWith("prop")) {
-                            type = FIND_BY_PROPERTY;
-                            propNode = currentNode;
-                        }
-                        if (currentNode.getNodeName().endsWith("propname")) {
-                            type = FIND_PROPERTY_NAMES;
-                        }
-                        if (currentNode.getNodeName().endsWith("allprop")) {
-                            type = FIND_ALL_PROP;
-                        }
-                        break;
+                        case Node.TEXT_NODE:
+                            break;
+                        case Node.ELEMENT_NODE:
+                            if (currentNode.getNodeName().endsWith("prop")) {
+                                type = FIND_BY_PROPERTY;
+                                propNode = currentNode;
+                            }
+                            if (currentNode.getNodeName().endsWith("propname")) {
+                                type = FIND_PROPERTY_NAMES;
+                            }
+                            if (currentNode.getNodeName().endsWith("allprop")) {
+                                type = FIND_ALL_PROP;
+                            }
+                            break;
                     }
                 }
             } catch (SAXException | IOException e) {
@@ -529,23 +529,22 @@ public class WebdavServlet extends DefaultServlet {
             @SuppressWarnings("null")
             NodeList childList = propNode.getChildNodes();
 
-            for (int i=0; i < childList.getLength(); i++) {
+            for (int i = 0; i < childList.getLength(); i++) {
                 Node currentNode = childList.item(i);
                 switch (currentNode.getNodeType()) {
-                case Node.TEXT_NODE:
-                    break;
-                case Node.ELEMENT_NODE:
-                    String nodeName = currentNode.getNodeName();
-                    String propertyName = null;
-                    if (nodeName.indexOf(':') != -1) {
-                        propertyName = nodeName.substring
-                            (nodeName.indexOf(':') + 1);
-                    } else {
-                        propertyName = nodeName;
-                    }
-                    // href is a live property which is handled differently
-                    properties.add(propertyName);
-                    break;
+                    case Node.TEXT_NODE:
+                        break;
+                    case Node.ELEMENT_NODE:
+                        String nodeName = currentNode.getNodeName();
+                        String propertyName = null;
+                        if (nodeName.indexOf(':') != -1) {
+                            propertyName = nodeName.substring(nodeName.indexOf(':') + 1);
+                        } else {
+                            propertyName = nodeName;
+                        }
+                        // href is a live property which is handled differently
+                        properties.add(propertyName);
+                        break;
                 }
             }
         }
@@ -654,8 +653,10 @@ public class WebdavServlet extends DefaultServlet {
 
     /**
      * PROPPATCH Method.
-     * @param req The Servlet request
+     *
+     * @param req  The Servlet request
      * @param resp The Servlet response
+     *
      * @throws IOException If an IO error occurs
      */
     protected void doProppatch(HttpServletRequest req, HttpServletResponse resp) throws IOException {
@@ -676,10 +677,12 @@ public class WebdavServlet extends DefaultServlet {
 
     /**
      * MKCOL Method.
-     * @param req The Servlet request
+     *
+     * @param req  The Servlet request
      * @param resp The Servlet response
+     *
      * @throws ServletException If an error occurs
-     * @throws IOException If an IO error occurs
+     * @throws IOException      If an IO error occurs
      */
     protected void doMkcol(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
 
@@ -713,7 +716,7 @@ public class WebdavServlet extends DefaultServlet {
                 resp.sendError(WebdavStatus.SC_NOT_IMPLEMENTED);
                 return;
 
-            } catch(SAXException saxe) {
+            } catch (SAXException saxe) {
                 // Parse error - assume invalid content
                 resp.sendError(WebdavStatus.SC_UNSUPPORTED_MEDIA_TYPE);
                 return;
@@ -732,10 +735,12 @@ public class WebdavServlet extends DefaultServlet {
 
     /**
      * DELETE Method.
-     * @param req The Servlet request
+     *
+     * @param req  The Servlet request
      * @param resp The Servlet response
+     *
      * @throws ServletException If an error occurs
-     * @throws IOException If an IO error occurs
+     * @throws IOException      If an IO error occurs
      */
     @Override
     protected void doDelete(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
@@ -757,10 +762,10 @@ public class WebdavServlet extends DefaultServlet {
     /**
      * Process a PUT request for the specified resource.
      *
-     * @param req The servlet request we are processing
+     * @param req  The servlet request we are processing
      * @param resp The servlet response we are creating
      *
-     * @exception IOException if an input/output error occurs
+     * @exception IOException      if an input/output error occurs
      * @exception ServletException if a servlet-specified error occurs
      */
     @Override
@@ -787,8 +792,10 @@ public class WebdavServlet extends DefaultServlet {
 
     /**
      * COPY Method.
-     * @param req The Servlet request
+     *
+     * @param req  The Servlet request
      * @param resp The Servlet response
+     *
      * @throws IOException If an IO error occurs
      */
     protected void doCopy(HttpServletRequest req, HttpServletResponse resp) throws IOException {
@@ -804,8 +811,10 @@ public class WebdavServlet extends DefaultServlet {
 
     /**
      * MOVE Method.
-     * @param req The Servlet request
+     *
+     * @param req  The Servlet request
      * @param resp The Servlet response
+     *
      * @throws IOException If an IO error occurs
      */
     protected void doMove(HttpServletRequest req, HttpServletResponse resp) throws IOException {
@@ -830,10 +839,12 @@ public class WebdavServlet extends DefaultServlet {
 
     /**
      * LOCK Method.
-     * @param req The Servlet request
+     *
+     * @param req  The Servlet request
      * @param resp The Servlet response
+     *
      * @throws ServletException If an error occurs
-     * @throws IOException If an IO error occurs
+     * @throws IOException      If an IO error occurs
      */
     protected void doLock(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
 
@@ -873,7 +884,7 @@ public class WebdavServlet extends DefaultServlet {
             int commaPos = lockDurationStr.indexOf(',');
             // If multiple timeouts, just use the first
             if (commaPos != -1) {
-                lockDurationStr = lockDurationStr.substring(0,commaPos);
+                lockDurationStr = lockDurationStr.substring(0, commaPos);
             }
             if (lockDurationStr.startsWith("Second-")) {
                 lockDuration = Integer.parseInt(lockDurationStr.substring(7));
@@ -925,42 +936,42 @@ public class WebdavServlet extends DefaultServlet {
             Node lockTypeNode = null;
             Node lockOwnerNode = null;
 
-            for (int i=0; i < childList.getLength(); i++) {
+            for (int i = 0; i < childList.getLength(); i++) {
                 Node currentNode = childList.item(i);
                 switch (currentNode.getNodeType()) {
-                case Node.TEXT_NODE:
-                    break;
-                case Node.ELEMENT_NODE:
-                    String nodeName = currentNode.getNodeName();
-                    if (nodeName.endsWith("lockscope")) {
-                        lockScopeNode = currentNode;
-                    }
-                    if (nodeName.endsWith("locktype")) {
-                        lockTypeNode = currentNode;
-                    }
-                    if (nodeName.endsWith("owner")) {
-                        lockOwnerNode = currentNode;
-                    }
-                    break;
+                    case Node.TEXT_NODE:
+                        break;
+                    case Node.ELEMENT_NODE:
+                        String nodeName = currentNode.getNodeName();
+                        if (nodeName.endsWith("lockscope")) {
+                            lockScopeNode = currentNode;
+                        }
+                        if (nodeName.endsWith("locktype")) {
+                            lockTypeNode = currentNode;
+                        }
+                        if (nodeName.endsWith("owner")) {
+                            lockOwnerNode = currentNode;
+                        }
+                        break;
                 }
             }
 
             if (lockScopeNode != null) {
 
                 childList = lockScopeNode.getChildNodes();
-                for (int i=0; i < childList.getLength(); i++) {
+                for (int i = 0; i < childList.getLength(); i++) {
                     Node currentNode = childList.item(i);
                     switch (currentNode.getNodeType()) {
-                    case Node.TEXT_NODE:
-                        break;
-                    case Node.ELEMENT_NODE:
-                        String tempScope = currentNode.getNodeName();
-                        if (tempScope.indexOf(':') != -1) {
-                            lock.scope = tempScope.substring(tempScope.indexOf(':') + 1);
-                        } else {
-                            lock.scope = tempScope;
-                        }
-                        break;
+                        case Node.TEXT_NODE:
+                            break;
+                        case Node.ELEMENT_NODE:
+                            String tempScope = currentNode.getNodeName();
+                            if (tempScope.indexOf(':') != -1) {
+                                lock.scope = tempScope.substring(tempScope.indexOf(':') + 1);
+                            } else {
+                                lock.scope = tempScope;
+                            }
+                            break;
                     }
                 }
 
@@ -977,19 +988,19 @@ public class WebdavServlet extends DefaultServlet {
             if (lockTypeNode != null) {
 
                 childList = lockTypeNode.getChildNodes();
-                for (int i=0; i < childList.getLength(); i++) {
+                for (int i = 0; i < childList.getLength(); i++) {
                     Node currentNode = childList.item(i);
                     switch (currentNode.getNodeType()) {
-                    case Node.TEXT_NODE:
-                        break;
-                    case Node.ELEMENT_NODE:
-                        String tempType = currentNode.getNodeName();
-                        if (tempType.indexOf(':') != -1) {
-                            lock.type = tempType.substring(tempType.indexOf(':') + 1);
-                        } else {
-                            lock.type = tempType;
-                        }
-                        break;
+                        case Node.TEXT_NODE:
+                            break;
+                        case Node.ELEMENT_NODE:
+                            String tempType = currentNode.getNodeName();
+                            if (tempType.indexOf(':') != -1) {
+                                lock.type = tempType.substring(tempType.indexOf(':') + 1);
+                            } else {
+                                lock.type = tempType;
+                            }
+                            break;
                     }
                 }
 
@@ -1006,18 +1017,18 @@ public class WebdavServlet extends DefaultServlet {
             if (lockOwnerNode != null) {
 
                 childList = lockOwnerNode.getChildNodes();
-                for (int i=0; i < childList.getLength(); i++) {
+                for (int i = 0; i < childList.getLength(); i++) {
                     Node currentNode = childList.item(i);
                     switch (currentNode.getNodeType()) {
-                    case Node.TEXT_NODE:
-                        lock.owner += currentNode.getNodeValue();
-                        break;
-                    case Node.ELEMENT_NODE:
-                        strWriter = new StringWriter();
-                        domWriter = new DOMWriter(strWriter);
-                        domWriter.print(currentNode);
-                        lock.owner += strWriter.toString();
-                        break;
+                        case Node.TEXT_NODE:
+                            lock.owner += currentNode.getNodeValue();
+                            break;
+                        case Node.ELEMENT_NODE:
+                            strWriter = new StringWriter();
+                            domWriter = new DOMWriter(strWriter);
+                            domWriter.print(currentNode);
+                            lock.owner += strWriter.toString();
+                            break;
                     }
                 }
 
@@ -1040,13 +1051,11 @@ public class WebdavServlet extends DefaultServlet {
         if (lockRequestType == LOCK_CREATION) {
 
             // Generating lock id
-            String lockTokenStr = req.getServletPath() + "-" + lock.type + "-" +
-                    lock.scope + "-" + req.getUserPrincipal() + "-" +
-                    lock.depth + "-" + lock.owner + "-" + lock.tokens + "-" +
-                    lock.expiresAt + "-" + System.currentTimeMillis() + "-" +
-                    secret;
-            String lockToken = HexUtils.toHexString(ConcurrentMessageDigest.digestMD5(
-                    lockTokenStr.getBytes(StandardCharsets.ISO_8859_1)));
+            String lockTokenStr = req.getServletPath() + "-" + lock.type + "-" + lock.scope + "-" +
+                    req.getUserPrincipal() + "-" + lock.depth + "-" + lock.owner + "-" + lock.tokens + "-" +
+                    lock.expiresAt + "-" + System.currentTimeMillis() + "-" + secret;
+            String lockToken = HexUtils
+                    .toHexString(ConcurrentMessageDigest.digestMD5(lockTokenStr.getBytes(StandardCharsets.ISO_8859_1)));
 
             if (resource.isDirectory() && lock.depth == maxDepth) {
 
@@ -1062,8 +1071,7 @@ public class WebdavServlet extends DefaultServlet {
                         collectionLocksIterator.remove();
                         continue;
                     }
-                    if (currentLock.path.startsWith(lock.path) &&
-                            (currentLock.isExclusive() || lock.isExclusive())) {
+                    if (currentLock.path.startsWith(lock.path) && (currentLock.isExclusive() || lock.isExclusive())) {
                         // A child collection of this collection is locked
                         lockPaths.add(currentLock.path);
                     }
@@ -1073,8 +1081,7 @@ public class WebdavServlet extends DefaultServlet {
                         resourceLocks.remove(currentLock.path);
                         continue;
                     }
-                    if (currentLock.path.startsWith(lock.path) &&
-                            (currentLock.isExclusive() || lock.isExclusive())) {
+                    if (currentLock.path.startsWith(lock.path) && (currentLock.isExclusive() || lock.isExclusive())) {
                         // A child resource of this collection is locked
                         lockPaths.add(currentLock.path);
                     }
@@ -1237,8 +1244,10 @@ public class WebdavServlet extends DefaultServlet {
 
     /**
      * UNLOCK Method.
-     * @param req The Servlet request
+     *
+     * @param req  The Servlet request
      * @param resp The Servlet response
+     *
      * @throws IOException If an IO error occurs
      */
     protected void doUnlock(HttpServletRequest req, HttpServletResponse resp) throws IOException {
@@ -1310,14 +1319,13 @@ public class WebdavServlet extends DefaultServlet {
     // -------------------------------------------------------- Private Methods
 
     /**
-     * Check to see if a resource is currently write locked. The method
-     * will look at the "If" header to make sure the client
-     * has give the appropriate lock tokens.
+     * Check to see if a resource is currently write locked. The method will look at the "If" header to make sure the
+     * client has give the appropriate lock tokens.
      *
      * @param req Servlet request
-     * @return <code>true</code> if the resource is locked (and no appropriate
-     *  lock token has been found for at least one of
-     *  the non-shared locks which are present on the resource).
+     *
+     * @return <code>true</code> if the resource is locked (and no appropriate lock token has been found for at least
+     *             one of the non-shared locks which are present on the resource).
      */
     private boolean isLocked(HttpServletRequest req) {
 
@@ -1340,11 +1348,11 @@ public class WebdavServlet extends DefaultServlet {
     /**
      * Check to see if a resource is currently write locked.
      *
-     * @param path Path of the resource
+     * @param path     Path of the resource
      * @param ifHeader "If" HTTP header which was included in the request
-     * @return <code>true</code> if the resource is locked (and no appropriate
-     *  lock token has been found for at least one of
-     *  the non-shared locks which are present on the resource).
+     *
+     * @return <code>true</code> if the resource is locked (and no appropriate lock token has been found for at least
+     *             one of the non-shared locks which are present on the resource).
      */
     private boolean isLocked(String path, String ifHeader) {
 
@@ -1396,7 +1404,7 @@ public class WebdavServlet extends DefaultServlet {
     /**
      * Copy a resource.
      *
-     * @param req Servlet request
+     * @param req  Servlet request
      * @param resp Servlet response
      *
      * @return boolean true if the copy is successful
@@ -1417,14 +1425,14 @@ public class WebdavServlet extends DefaultServlet {
         // See RFC 4918
         String destinationHeader = req.getHeader("Destination");
 
-        if (destinationHeader == null  || destinationHeader.isEmpty()) {
+        if (destinationHeader == null || destinationHeader.isEmpty()) {
             resp.sendError(WebdavStatus.SC_BAD_REQUEST);
             return false;
         }
 
         URI destinationUri;
         try {
-            destinationUri = new URI (destinationHeader);
+            destinationUri = new URI(destinationHeader);
         } catch (URISyntaxException e) {
             resp.sendError(WebdavStatus.SC_BAD_REQUEST);
             return false;
@@ -1448,8 +1456,7 @@ public class WebdavServlet extends DefaultServlet {
             // Port needs to match too but handled separately as the logic is a
             // little more complicated
             if (req.getServerPort() != destinationUri.getPort()) {
-                if (destinationUri.getPort() == -1 &&
-                        ("http".equals(req.getScheme()) && req.getServerPort() == 80 ||
+                if (destinationUri.getPort() == -1 && ("http".equals(req.getScheme()) && req.getServerPort() == 80 ||
                         "https".equals(req.getScheme()) && req.getServerPort() == 443)) {
                     // All good.
                 } else {
@@ -1553,10 +1560,10 @@ public class WebdavServlet extends DefaultServlet {
     /**
      * Copy a collection.
      *
-     * @param errorList Hashtable containing the list of errors which occurred
-     * during the copy operation
-     * @param source Path of the resource to be copied
-     * @param dest Destination path
+     * @param errorList Hashtable containing the list of errors which occurred during the copy operation
+     * @param source    Path of the resource to be copied
+     * @param dest      Destination path
+     *
      * @return <code>true</code> if the copy was successful
      */
     private boolean copyResource(Map<String,Integer> errorList, String source, String dest) {
@@ -1629,9 +1636,11 @@ public class WebdavServlet extends DefaultServlet {
     /**
      * Delete a resource.
      *
-     * @param req Servlet request
+     * @param req  Servlet request
      * @param resp Servlet response
+     *
      * @return <code>true</code> if the delete is successful
+     *
      * @throws IOException If an IO error occurs
      */
     private boolean deleteResource(HttpServletRequest req, HttpServletResponse resp) throws IOException {
@@ -1643,12 +1652,13 @@ public class WebdavServlet extends DefaultServlet {
     /**
      * Delete a resource.
      *
-     * @param path Path of the resource which is to be deleted
-     * @param req Servlet request
-     * @param resp Servlet response
-     * @param setStatus Should the response status be set on successful
-     *                  completion
+     * @param path      Path of the resource which is to be deleted
+     * @param req       Servlet request
+     * @param resp      Servlet response
+     * @param setStatus Should the response status be set on successful completion
+     *
      * @return <code>true</code> if the delete is successful
+     *
      * @throws IOException If an IO error occurs
      */
     private boolean deleteResource(String path, HttpServletRequest req, HttpServletResponse resp, boolean setStatus)
@@ -1687,8 +1697,7 @@ public class WebdavServlet extends DefaultServlet {
 
             deleteCollection(req, path, errorList);
             if (!resource.delete()) {
-                errorList.put(path, Integer.valueOf
-                    (WebdavStatus.SC_INTERNAL_SERVER_ERROR));
+                errorList.put(path, Integer.valueOf(WebdavStatus.SC_INTERNAL_SERVER_ERROR));
             }
 
             if (!errorList.isEmpty()) {
@@ -1705,8 +1714,9 @@ public class WebdavServlet extends DefaultServlet {
 
     /**
      * Deletes a collection.
-     * @param req The Servlet request
-     * @param path Path to the collection to be deleted
+     *
+     * @param req       The Servlet request
+     * @param path      Path to the collection to be deleted
      * @param errorList Contains the list of the errors which occurred
      */
     private void deleteCollection(HttpServletRequest req, String path, Map<String,Integer> errorList) {
@@ -1754,8 +1764,7 @@ public class WebdavServlet extends DefaultServlet {
                     if (!childResource.isDirectory()) {
                         // If it's not a collection, then it's an unknown
                         // error
-                        errorList.put(childName, Integer.valueOf(
-                                WebdavStatus.SC_INTERNAL_SERVER_ERROR));
+                        errorList.put(childName, Integer.valueOf(WebdavStatus.SC_INTERNAL_SERVER_ERROR));
                     }
                 }
             }
@@ -1764,11 +1773,10 @@ public class WebdavServlet extends DefaultServlet {
 
 
     /**
-     * Send a multistatus element containing a complete error report to the
-     * client.
+     * Send a multistatus element containing a complete error report to the client.
      *
-     * @param req Servlet request
-     * @param resp Servlet response
+     * @param req       Servlet request
+     * @param resp      Servlet response
      * @param errorList List of error to be displayed
      *
      * @throws IOException If an IO error occurs
@@ -1783,7 +1791,7 @@ public class WebdavServlet extends DefaultServlet {
 
         generatedXML.writeElement("D", DEFAULT_NAMESPACE, "multistatus", XMLWriter.OPENING);
 
-        for (Map.Entry<String, Integer> errorEntry : errorList.entrySet()) {
+        for (Map.Entry<String,Integer> errorEntry : errorList.entrySet()) {
             String errorPath = errorEntry.getKey();
             int errorCode = errorEntry.getValue().intValue();
 
@@ -1811,12 +1819,11 @@ public class WebdavServlet extends DefaultServlet {
     /**
      * Propfind helper method.
      *
-     * @param req The servlet request
+     * @param req          The servlet request
      * @param generatedXML XML response to the Propfind request
-     * @param path Path of the current resource
-     * @param type Propfind type
-     * @param properties If the propfind type is find properties by name, then
-     *                      this List contains those properties
+     * @param path         Path of the current resource
+     * @param type         Propfind type
+     * @param properties   If the propfind type is find properties by name, then this List contains those properties
      */
     private void parseProperties(HttpServletRequest req, XMLWriter generatedXML, String path, int type,
             List<String> properties) {
@@ -1854,12 +1861,11 @@ public class WebdavServlet extends DefaultServlet {
     /**
      * Propfind helper method. Displays the properties of a lock-null resource.
      *
-     * @param req The servlet request
+     * @param req          The servlet request
      * @param generatedXML XML response to the Propfind request
-     * @param path Path of the current resource
-     * @param type Propfind type
-     * @param properties If the propfind type is find properties by name, then
-     *                      this List contains those properties
+     * @param path         Path of the current resource
+     * @param type         Propfind type
+     * @param properties   If the propfind type is find properties by name, then this List contains those properties
      */
     private void parseLockNullProperties(HttpServletRequest req, XMLWriter generatedXML, String path, int type,
             List<String> properties) {
@@ -1910,182 +1916,160 @@ public class WebdavServlet extends DefaultServlet {
 
         switch (propFindType) {
 
-        case FIND_ALL_PROP :
+            case FIND_ALL_PROP:
 
-            generatedXML.writeElement("D", "propstat", XMLWriter.OPENING);
-            generatedXML.writeElement("D", "prop", XMLWriter.OPENING);
+                generatedXML.writeElement("D", "propstat", XMLWriter.OPENING);
+                generatedXML.writeElement("D", "prop", XMLWriter.OPENING);
 
-            generatedXML.writeProperty("D", "creationdate", getISOCreationDate(created));
-            generatedXML.writeElement("D", "displayname", XMLWriter.OPENING);
-            generatedXML.writeData(resourceName);
-            generatedXML.writeElement("D", "displayname", XMLWriter.CLOSING);
-            if (isFile) {
-                generatedXML.writeProperty("D", "getlastmodified", FastHttpDateFormat.formatDate(lastModified));
-                generatedXML.writeProperty("D", "getcontentlength", Long.toString(contentLength));
-                if (contentType != null) {
-                    generatedXML.writeProperty("D", "getcontenttype", contentType);
-                }
-                generatedXML.writeProperty("D", "getetag", eTag);
-                if (isLockNull) {
+                generatedXML.writeProperty("D", "creationdate", getISOCreationDate(created));
+                generatedXML.writeElement("D", "displayname", XMLWriter.OPENING);
+                generatedXML.writeData(resourceName);
+                generatedXML.writeElement("D", "displayname", XMLWriter.CLOSING);
+                if (isFile) {
+                    generatedXML.writeProperty("D", "getlastmodified", FastHttpDateFormat.formatDate(lastModified));
+                    generatedXML.writeProperty("D", "getcontentlength", Long.toString(contentLength));
+                    if (contentType != null) {
+                        generatedXML.writeProperty("D", "getcontenttype", contentType);
+                    }
+                    generatedXML.writeProperty("D", "getetag", eTag);
+                    if (isLockNull) {
+                        generatedXML.writeElement("D", "resourcetype", XMLWriter.OPENING);
+                        generatedXML.writeElement("D", "lock-null", XMLWriter.NO_CONTENT);
+                        generatedXML.writeElement("D", "resourcetype", XMLWriter.CLOSING);
+                    } else {
+                        generatedXML.writeElement("D", "resourcetype", XMLWriter.NO_CONTENT);
+                    }
+                } else {
+                    generatedXML.writeProperty("D", "getlastmodified", FastHttpDateFormat.formatDate(lastModified));
                     generatedXML.writeElement("D", "resourcetype", XMLWriter.OPENING);
-                    generatedXML.writeElement("D", "lock-null", XMLWriter.NO_CONTENT);
+                    generatedXML.writeElement("D", "collection", XMLWriter.NO_CONTENT);
                     generatedXML.writeElement("D", "resourcetype", XMLWriter.CLOSING);
-                } else {
-                    generatedXML.writeElement("D", "resourcetype", XMLWriter.NO_CONTENT);
                 }
-            } else {
-                generatedXML.writeProperty("D", "getlastmodified", FastHttpDateFormat.formatDate(lastModified));
-                generatedXML.writeElement("D", "resourcetype", XMLWriter.OPENING);
-                generatedXML.writeElement("D", "collection", XMLWriter.NO_CONTENT);
-                generatedXML.writeElement("D", "resourcetype", XMLWriter.CLOSING);
-            }
 
-            generatedXML.writeProperty("D", "source", "");
+                generatedXML.writeProperty("D", "source", "");
 
-            String supportedLocks = "<D:lockentry>"
-                + "<D:lockscope><D:exclusive/></D:lockscope>"
-                + "<D:locktype><D:write/></D:locktype>"
-                + "</D:lockentry>" + "<D:lockentry>"
-                + "<D:lockscope><D:shared/></D:lockscope>"
-                + "<D:locktype><D:write/></D:locktype>"
-                + "</D:lockentry>";
-            generatedXML.writeElement("D", "supportedlock", XMLWriter.OPENING);
-            generatedXML.writeText(supportedLocks);
-            generatedXML.writeElement("D", "supportedlock", XMLWriter.CLOSING);
+                String supportedLocks = "<D:lockentry>" + "<D:lockscope><D:exclusive/></D:lockscope>" +
+                        "<D:locktype><D:write/></D:locktype>" + "</D:lockentry>" + "<D:lockentry>" +
+                        "<D:lockscope><D:shared/></D:lockscope>" + "<D:locktype><D:write/></D:locktype>" +
+                        "</D:lockentry>";
+                generatedXML.writeElement("D", "supportedlock", XMLWriter.OPENING);
+                generatedXML.writeText(supportedLocks);
+                generatedXML.writeElement("D", "supportedlock", XMLWriter.CLOSING);
 
-            generateLockDiscovery(path, generatedXML);
+                generateLockDiscovery(path, generatedXML);
 
-            generatedXML.writeElement("D", "prop", XMLWriter.CLOSING);
-            generatedXML.writeElement("D", "status", XMLWriter.OPENING);
-            generatedXML.writeText(status);
-            generatedXML.writeElement("D", "status", XMLWriter.CLOSING);
-            generatedXML.writeElement("D", "propstat", XMLWriter.CLOSING);
+                generatedXML.writeElement("D", "prop", XMLWriter.CLOSING);
+                generatedXML.writeElement("D", "status", XMLWriter.OPENING);
+                generatedXML.writeText(status);
+                generatedXML.writeElement("D", "status", XMLWriter.CLOSING);
+                generatedXML.writeElement("D", "propstat", XMLWriter.CLOSING);
 
-            break;
+                break;
 
-        case FIND_PROPERTY_NAMES :
+            case FIND_PROPERTY_NAMES:
 
-            generatedXML.writeElement("D", "propstat", XMLWriter.OPENING);
-            generatedXML.writeElement("D", "prop", XMLWriter.OPENING);
+                generatedXML.writeElement("D", "propstat", XMLWriter.OPENING);
+                generatedXML.writeElement("D", "prop", XMLWriter.OPENING);
 
-            generatedXML.writeElement("D", "creationdate", XMLWriter.NO_CONTENT);
-            generatedXML.writeElement("D", "displayname", XMLWriter.NO_CONTENT);
-            if (isFile) {
-                generatedXML.writeElement("D", "getcontentlanguage", XMLWriter.NO_CONTENT);
-                generatedXML.writeElement("D", "getcontentlength", XMLWriter.NO_CONTENT);
-                generatedXML.writeElement("D", "getcontenttype", XMLWriter.NO_CONTENT);
-                generatedXML.writeElement("D", "getetag", XMLWriter.NO_CONTENT);
-                generatedXML.writeElement("D", "getlastmodified", XMLWriter.NO_CONTENT);
-            }
-            generatedXML.writeElement("D", "resourcetype", XMLWriter.NO_CONTENT);
-            generatedXML.writeElement("D", "source", XMLWriter.NO_CONTENT);
-            generatedXML.writeElement("D", "lockdiscovery", XMLWriter.NO_CONTENT);
+                generatedXML.writeElement("D", "creationdate", XMLWriter.NO_CONTENT);
+                generatedXML.writeElement("D", "displayname", XMLWriter.NO_CONTENT);
+                if (isFile) {
+                    generatedXML.writeElement("D", "getcontentlanguage", XMLWriter.NO_CONTENT);
+                    generatedXML.writeElement("D", "getcontentlength", XMLWriter.NO_CONTENT);
+                    generatedXML.writeElement("D", "getcontenttype", XMLWriter.NO_CONTENT);
+                    generatedXML.writeElement("D", "getetag", XMLWriter.NO_CONTENT);
+                    generatedXML.writeElement("D", "getlastmodified", XMLWriter.NO_CONTENT);
+                }
+                generatedXML.writeElement("D", "resourcetype", XMLWriter.NO_CONTENT);
+                generatedXML.writeElement("D", "source", XMLWriter.NO_CONTENT);
+                generatedXML.writeElement("D", "lockdiscovery", XMLWriter.NO_CONTENT);
 
-            generatedXML.writeElement("D", "prop", XMLWriter.CLOSING);
-            generatedXML.writeElement("D", "status", XMLWriter.OPENING);
-            generatedXML.writeText(status);
-            generatedXML.writeElement("D", "status", XMLWriter.CLOSING);
-            generatedXML.writeElement("D", "propstat", XMLWriter.CLOSING);
+                generatedXML.writeElement("D", "prop", XMLWriter.CLOSING);
+                generatedXML.writeElement("D", "status", XMLWriter.OPENING);
+                generatedXML.writeText(status);
+                generatedXML.writeElement("D", "status", XMLWriter.CLOSING);
+                generatedXML.writeElement("D", "propstat", XMLWriter.CLOSING);
 
-            break;
+                break;
 
-        case FIND_BY_PROPERTY :
+            case FIND_BY_PROPERTY:
 
-            List<String> propertiesNotFound = new ArrayList<>();
+                List<String> propertiesNotFound = new ArrayList<>();
 
-            // Parse the list of properties
+                // Parse the list of properties
 
-            generatedXML.writeElement("D", "propstat", XMLWriter.OPENING);
-            generatedXML.writeElement("D", "prop", XMLWriter.OPENING);
+                generatedXML.writeElement("D", "propstat", XMLWriter.OPENING);
+                generatedXML.writeElement("D", "prop", XMLWriter.OPENING);
 
-            for (String property : properties) {
-                if (property.equals("creationdate")) {
-                    generatedXML.writeProperty("D", "creationdate", getISOCreationDate(created));
-                } else if (property.equals("displayname")) {
-                    generatedXML.writeElement("D", "displayname", XMLWriter.OPENING);
-                    generatedXML.writeData(resourceName);
-                    generatedXML.writeElement("D", "displayname", XMLWriter.CLOSING);
-                } else if (property.equals("getcontentlanguage")) {
-                    if (isFile) {
-                        generatedXML.writeElement("D", "getcontentlanguage", XMLWriter.NO_CONTENT);
-                    } else {
-                        propertiesNotFound.add(property);
-                    }
-                } else if (property.equals("getcontentlength")) {
-                    if (isFile) {
-                        generatedXML.writeProperty("D", "getcontentlength", Long.toString(contentLength));
-                    } else {
-                        propertiesNotFound.add(property);
-                    }
-                } else if (property.equals("getcontenttype")) {
-                    if (isFile) {
-                        generatedXML.writeProperty("D", "getcontenttype", contentType);
-                    } else {
-                        propertiesNotFound.add(property);
-                    }
-                } else if (property.equals("getetag")) {
-                    if (isFile) {
-                        generatedXML.writeProperty("D", "getetag", eTag);
-                    } else {
-                        propertiesNotFound.add(property);
-                    }
-                } else if (property.equals("getlastmodified")) {
-                    if (isFile) {
-                        generatedXML.writeProperty("D", "getlastmodified", FastHttpDateFormat.formatDate(lastModified));
-                    } else {
-                        propertiesNotFound.add(property);
-                    }
-                } else if (property.equals("resourcetype")) {
-                    if (isFile) {
-                        if(isLockNull) {
+                for (String property : properties) {
+                    if (property.equals("creationdate")) {
+                        generatedXML.writeProperty("D", "creationdate", getISOCreationDate(created));
+                    } else if (property.equals("displayname")) {
+                        generatedXML.writeElement("D", "displayname", XMLWriter.OPENING);
+                        generatedXML.writeData(resourceName);
+                        generatedXML.writeElement("D", "displayname", XMLWriter.CLOSING);
+                    } else if (property.equals("getcontentlanguage")) {
+                        if (isFile) {
+                            generatedXML.writeElement("D", "getcontentlanguage", XMLWriter.NO_CONTENT);
+                        } else {
+                            propertiesNotFound.add(property);
+                        }
+                    } else if (property.equals("getcontentlength")) {
+                        if (isFile) {
+                            generatedXML.writeProperty("D", "getcontentlength", Long.toString(contentLength));
+                        } else {
+                            propertiesNotFound.add(property);
+                        }
+                    } else if (property.equals("getcontenttype")) {
+                        if (isFile) {
+                            generatedXML.writeProperty("D", "getcontenttype", contentType);
+                        } else {
+                            propertiesNotFound.add(property);
+                        }
+                    } else if (property.equals("getetag")) {
+                        if (isFile) {
+                            generatedXML.writeProperty("D", "getetag", eTag);
+                        } else {
+                            propertiesNotFound.add(property);
+                        }
+                    } else if (property.equals("getlastmodified")) {
+                        if (isFile) {
+                            generatedXML.writeProperty("D", "getlastmodified",
+                                    FastHttpDateFormat.formatDate(lastModified));
+                        } else {
+                            propertiesNotFound.add(property);
+                        }
+                    } else if (property.equals("resourcetype")) {
+                        if (isFile) {
+                            if (isLockNull) {
+                                generatedXML.writeElement("D", "resourcetype", XMLWriter.OPENING);
+                                generatedXML.writeElement("D", "lock-null", XMLWriter.NO_CONTENT);
+                                generatedXML.writeElement("D", "resourcetype", XMLWriter.CLOSING);
+                            } else {
+                                generatedXML.writeElement("D", "resourcetype", XMLWriter.NO_CONTENT);
+                            }
+                        } else {
                             generatedXML.writeElement("D", "resourcetype", XMLWriter.OPENING);
-                            generatedXML.writeElement("D", "lock-null", XMLWriter.NO_CONTENT);
+                            generatedXML.writeElement("D", "collection", XMLWriter.NO_CONTENT);
                             generatedXML.writeElement("D", "resourcetype", XMLWriter.CLOSING);
-                        } else {
-                            generatedXML.writeElement("D", "resourcetype", XMLWriter.NO_CONTENT);
+                        }
+                    } else if (property.equals("source")) {
+                        generatedXML.writeProperty("D", "source", "");
+                    } else if (property.equals("supportedlock")) {
+                        supportedLocks = "<D:lockentry>" + "<D:lockscope><D:exclusive/></D:lockscope>" +
+                                "<D:locktype><D:write/></D:locktype>" + "</D:lockentry>" + "<D:lockentry>" +
+                                "<D:lockscope><D:shared/></D:lockscope>" + "<D:locktype><D:write/></D:locktype>" +
+                                "</D:lockentry>";
+                        generatedXML.writeElement("D", "supportedlock", XMLWriter.OPENING);
+                        generatedXML.writeText(supportedLocks);
+                        generatedXML.writeElement("D", "supportedlock", XMLWriter.CLOSING);
+                    } else if (property.equals("lockdiscovery")) {
+                        if (!generateLockDiscovery(path, generatedXML)) {
+                            propertiesNotFound.add(property);
                         }
                     } else {
-                        generatedXML.writeElement("D", "resourcetype", XMLWriter.OPENING);
-                        generatedXML.writeElement("D", "collection", XMLWriter.NO_CONTENT);
-                        generatedXML.writeElement("D", "resourcetype",XMLWriter.CLOSING);
-                    }
-                } else if (property.equals("source")) {
-                    generatedXML.writeProperty("D", "source", "");
-                } else if (property.equals("supportedlock")) {
-                    supportedLocks = "<D:lockentry>"
-                        + "<D:lockscope><D:exclusive/></D:lockscope>"
-                        + "<D:locktype><D:write/></D:locktype>"
-                        + "</D:lockentry>" + "<D:lockentry>"
-                        + "<D:lockscope><D:shared/></D:lockscope>"
-                        + "<D:locktype><D:write/></D:locktype>"
-                        + "</D:lockentry>";
-                    generatedXML.writeElement("D", "supportedlock", XMLWriter.OPENING);
-                    generatedXML.writeText(supportedLocks);
-                    generatedXML.writeElement("D", "supportedlock", XMLWriter.CLOSING);
-                } else if (property.equals("lockdiscovery")) {
-                    if (!generateLockDiscovery(path, generatedXML)) {
                         propertiesNotFound.add(property);
                     }
-                } else {
-                    propertiesNotFound.add(property);
-                }
-            }
-
-            generatedXML.writeElement("D", "prop", XMLWriter.CLOSING);
-            generatedXML.writeElement("D", "status", XMLWriter.OPENING);
-            generatedXML.writeText(status);
-            generatedXML.writeElement("D", "status", XMLWriter.CLOSING);
-            generatedXML.writeElement("D", "propstat", XMLWriter.CLOSING);
-
-            if (!propertiesNotFound.isEmpty()) {
-
-                status = "HTTP/1.1 " + WebdavStatus.SC_NOT_FOUND + " ";
-
-                generatedXML.writeElement("D", "propstat", XMLWriter.OPENING);
-                generatedXML.writeElement("D", "prop", XMLWriter.OPENING);
-
-                for (String propertyNotFound : propertiesNotFound) {
-                    generatedXML.writeElement("D", propertyNotFound, XMLWriter.NO_CONTENT);
                 }
 
                 generatedXML.writeElement("D", "prop", XMLWriter.CLOSING);
@@ -2093,9 +2077,26 @@ public class WebdavServlet extends DefaultServlet {
                 generatedXML.writeText(status);
                 generatedXML.writeElement("D", "status", XMLWriter.CLOSING);
                 generatedXML.writeElement("D", "propstat", XMLWriter.CLOSING);
-            }
 
-            break;
+                if (!propertiesNotFound.isEmpty()) {
+
+                    status = "HTTP/1.1 " + WebdavStatus.SC_NOT_FOUND + " ";
+
+                    generatedXML.writeElement("D", "propstat", XMLWriter.OPENING);
+                    generatedXML.writeElement("D", "prop", XMLWriter.OPENING);
+
+                    for (String propertyNotFound : propertiesNotFound) {
+                        generatedXML.writeElement("D", propertyNotFound, XMLWriter.NO_CONTENT);
+                    }
+
+                    generatedXML.writeElement("D", "prop", XMLWriter.CLOSING);
+                    generatedXML.writeElement("D", "status", XMLWriter.OPENING);
+                    generatedXML.writeText(status);
+                    generatedXML.writeElement("D", "status", XMLWriter.CLOSING);
+                    generatedXML.writeElement("D", "propstat", XMLWriter.CLOSING);
+                }
+
+                break;
         }
 
         generatedXML.writeElement("D", "response", XMLWriter.CLOSING);
@@ -2105,8 +2106,9 @@ public class WebdavServlet extends DefaultServlet {
     /**
      * Print the lock discovery information associated with a path.
      *
-     * @param path Path
+     * @param path         Path
      * @param generatedXML XML data to which the locks info will be appended
+     *
      * @return <code>true</code> if at least one lock was displayed
      */
     private boolean generateLockDiscovery(String path, XMLWriter generatedXML) {
@@ -2125,8 +2127,7 @@ public class WebdavServlet extends DefaultServlet {
             if (path.startsWith(currentLock.path)) {
                 if (!wroteStart) {
                     wroteStart = true;
-                    generatedXML.writeElement("D", "lockdiscovery",
-                            XMLWriter.OPENING);
+                    generatedXML.writeElement("D", "lockdiscovery", XMLWriter.OPENING);
                 }
                 currentLock.toXML(generatedXML);
             }
@@ -2144,6 +2145,7 @@ public class WebdavServlet extends DefaultServlet {
 
     /**
      * Get creation date in ISO format.
+     *
      * @return the formatted creation date
      */
     private String getISOCreationDate(long creationDate) {
@@ -2193,7 +2195,7 @@ public class WebdavServlet extends DefaultServlet {
     }
 
 
-    // --------------------------------------------------  LockInfo Inner Class
+    // -------------------------------------------------- LockInfo Inner Class
 
     /**
      * Holds a lock information.
@@ -2229,7 +2231,7 @@ public class WebdavServlet extends DefaultServlet {
         @Override
         public String toString() {
 
-            StringBuilder result =  new StringBuilder("Type:");
+            StringBuilder result = new StringBuilder("Type:");
             result.append(type);
             result.append("\nScope:");
             result.append(scope);
@@ -2267,8 +2269,7 @@ public class WebdavServlet extends DefaultServlet {
         /**
          * Get an XML representation of this lock token.
          *
-         * @param generatedXML The XML write to which the fragment will be
-         *                     appended
+         * @param generatedXML The XML write to which the fragment will be appended
          */
         public void toXML(XMLWriter generatedXML) {
 
@@ -2315,9 +2316,8 @@ public class WebdavServlet extends DefaultServlet {
     // --------------------------------------------- WebdavResolver Inner Class
     /**
      * Work around for XML parsers that don't fully respect
-     * {@link DocumentBuilderFactory#setExpandEntityReferences(boolean)} when
-     * called with <code>false</code>. External references are filtered out for
-     * security reasons. See CVE-2007-5461.
+     * {@link DocumentBuilderFactory#setExpandEntityReferences(boolean)} when called with <code>false</code>. External
+     * references are filtered out for security reasons. See CVE-2007-5461.
      */
     private static class WebdavResolver implements EntityResolver {
         private ServletContext context;
@@ -2327,7 +2327,7 @@ public class WebdavServlet extends DefaultServlet {
         }
 
         @Override
-        public InputSource resolveEntity (String publicId, String systemId) {
+        public InputSource resolveEntity(String publicId, String systemId) {
             context.log(sm.getString("webdavservlet.externalEntityIgnored", publicId, systemId));
             return new InputSource(new StringReader("Ignored external entity"));
         }
@@ -2335,15 +2335,13 @@ public class WebdavServlet extends DefaultServlet {
 }
 
 
-// --------------------------------------------------------  WebdavStatus Class
+// -------------------------------------------------------- WebdavStatus Class
 
 /**
- * Wraps the HttpServletResponse class to abstract the
- * specific protocol used.  To support other protocols
- * we would only need to modify this class and the
- * WebDavRetCode classes.
+ * Wraps the HttpServletResponse class to abstract the specific protocol used. To support other protocols we would only
+ * need to modify this class and the WebDavRetCode classes.
  *
- * @author              Marc Eaddy
+ * @author Marc Eaddy
  */
 class WebdavStatus {
 
@@ -2357,151 +2355,130 @@ class WebdavStatus {
 
 
     /**
-     * Status code (201) indicating the request succeeded and created
-     * a new resource on the server.
+     * Status code (201) indicating the request succeeded and created a new resource on the server.
      */
     public static final int SC_CREATED = HttpServletResponse.SC_CREATED;
 
 
     /**
-     * Status code (202) indicating that a request was accepted for
-     * processing, but was not completed.
+     * Status code (202) indicating that a request was accepted for processing, but was not completed.
      */
     public static final int SC_ACCEPTED = HttpServletResponse.SC_ACCEPTED;
 
 
     /**
-     * Status code (204) indicating that the request succeeded but that
-     * there was no new information to return.
+     * Status code (204) indicating that the request succeeded but that there was no new information to return.
      */
     public static final int SC_NO_CONTENT = HttpServletResponse.SC_NO_CONTENT;
 
 
     /**
-     * Status code (301) indicating that the resource has permanently
-     * moved to a new location, and that future references should use a
-     * new URI with their requests.
+     * Status code (301) indicating that the resource has permanently moved to a new location, and that future
+     * references should use a new URI with their requests.
      */
     public static final int SC_MOVED_PERMANENTLY = HttpServletResponse.SC_MOVED_PERMANENTLY;
 
 
     /**
-     * Status code (302) indicating that the resource has temporarily
-     * moved to another location, but that future references should
-     * still use the original URI to access the resource.
+     * Status code (302) indicating that the resource has temporarily moved to another location, but that future
+     * references should still use the original URI to access the resource.
      */
     public static final int SC_MOVED_TEMPORARILY = HttpServletResponse.SC_MOVED_TEMPORARILY;
 
 
     /**
-     * Status code (304) indicating that a conditional GET operation
-     * found that the resource was available and not modified.
+     * Status code (304) indicating that a conditional GET operation found that the resource was available and not
+     * modified.
      */
     public static final int SC_NOT_MODIFIED = HttpServletResponse.SC_NOT_MODIFIED;
 
 
     /**
-     * Status code (400) indicating the request sent by the client was
-     * syntactically incorrect.
+     * Status code (400) indicating the request sent by the client was syntactically incorrect.
      */
     public static final int SC_BAD_REQUEST = HttpServletResponse.SC_BAD_REQUEST;
 
 
     /**
-     * Status code (401) indicating that the request requires HTTP
-     * authentication.
+     * Status code (401) indicating that the request requires HTTP authentication.
      */
     public static final int SC_UNAUTHORIZED = HttpServletResponse.SC_UNAUTHORIZED;
 
 
     /**
-     * Status code (403) indicating the server understood the request
-     * but refused to fulfill it.
+     * Status code (403) indicating the server understood the request but refused to fulfill it.
      */
     public static final int SC_FORBIDDEN = HttpServletResponse.SC_FORBIDDEN;
 
 
     /**
-     * Status code (404) indicating that the requested resource is not
-     * available.
+     * Status code (404) indicating that the requested resource is not available.
      */
     public static final int SC_NOT_FOUND = HttpServletResponse.SC_NOT_FOUND;
 
 
     /**
-     * Status code (500) indicating an error inside the HTTP service
-     * which prevented it from fulfilling the request.
+     * Status code (500) indicating an error inside the HTTP service which prevented it from fulfilling the request.
      */
     public static final int SC_INTERNAL_SERVER_ERROR = HttpServletResponse.SC_INTERNAL_SERVER_ERROR;
 
 
     /**
-     * Status code (501) indicating the HTTP service does not support
-     * the functionality needed to fulfill the request.
+     * Status code (501) indicating the HTTP service does not support the functionality needed to fulfill the request.
      */
     public static final int SC_NOT_IMPLEMENTED = HttpServletResponse.SC_NOT_IMPLEMENTED;
 
 
     /**
-     * Status code (502) indicating that the HTTP server received an
-     * invalid response from a server it consulted when acting as a
-     * proxy or gateway.
+     * Status code (502) indicating that the HTTP server received an invalid response from a server it consulted when
+     * acting as a proxy or gateway.
      */
     public static final int SC_BAD_GATEWAY = HttpServletResponse.SC_BAD_GATEWAY;
 
 
     /**
-     * Status code (503) indicating that the HTTP service is
-     * temporarily overloaded, and unable to handle the request.
+     * Status code (503) indicating that the HTTP service is temporarily overloaded, and unable to handle the request.
      */
     public static final int SC_SERVICE_UNAVAILABLE = HttpServletResponse.SC_SERVICE_UNAVAILABLE;
 
 
     /**
-     * Status code (100) indicating the client may continue with
-     * its request.  This interim response is used to inform the
-     * client that the initial part of the request has been
-     * received and has not yet been rejected by the server.
+     * Status code (100) indicating the client may continue with its request. This interim response is used to inform
+     * the client that the initial part of the request has been received and has not yet been rejected by the server.
      */
     public static final int SC_CONTINUE = HttpServletResponse.SC_CONTINUE;
 
 
     /**
-     * Status code (405) indicating the method specified is not
-     * allowed for the resource.
+     * Status code (405) indicating the method specified is not allowed for the resource.
      */
     public static final int SC_METHOD_NOT_ALLOWED = HttpServletResponse.SC_METHOD_NOT_ALLOWED;
 
 
     /**
-     * Status code (409) indicating that the request could not be
-     * completed due to a conflict with the current state of the
-     * resource.
+     * Status code (409) indicating that the request could not be completed due to a conflict with the current state of
+     * the resource.
      */
     public static final int SC_CONFLICT = HttpServletResponse.SC_CONFLICT;
 
 
     /**
-     * Status code (412) indicating the precondition given in one
-     * or more of the request-header fields evaluated to false
-     * when it was tested on the server.
+     * Status code (412) indicating the precondition given in one or more of the request-header fields evaluated to
+     * false when it was tested on the server.
      */
     public static final int SC_PRECONDITION_FAILED = HttpServletResponse.SC_PRECONDITION_FAILED;
 
 
     /**
-     * Status code (413) indicating the server is refusing to
-     * process a request because the request entity is larger
+     * Status code (413) indicating the server is refusing to process a request because the request entity is larger
      * than the server is willing or able to process.
      */
     public static final int SC_REQUEST_TOO_LONG = HttpServletResponse.SC_REQUEST_ENTITY_TOO_LARGE;
 
 
     /**
-     * Status code (415) indicating the server is refusing to service
-     * the request because the entity of the request is in a format
-     * not supported by the requested resource for the requested
-     * method.
+     * Status code (415) indicating the server is refusing to service the request because the entity of the request is
+     * in a format not supported by the requested resource for the requested method.
      */
     public static final int SC_UNSUPPORTED_MEDIA_TYPE = HttpServletResponse.SC_UNSUPPORTED_MEDIA_TYPE;
 
@@ -2510,8 +2487,7 @@ class WebdavStatus {
 
 
     /**
-     * Status code (207) indicating that the response requires
-     * providing status for multiple independent operations.
+     * Status code (207) indicating that the response requires providing status for multiple independent operations.
      */
     public static final int SC_MULTI_STATUS = 207;
     // This one collides with HTTP 1.1
@@ -2519,8 +2495,7 @@ class WebdavStatus {
 
 
     /**
-     * Status code (418) indicating the entity body submitted with
-     * the PATCH method was not understood by the resource.
+     * Status code (418) indicating the entity body submitted with the PATCH method was not understood by the resource.
      */
     public static final int SC_UNPROCESSABLE_ENTITY = 418;
     // This one collides with HTTP 1.1
@@ -2528,9 +2503,8 @@ class WebdavStatus {
 
 
     /**
-     * Status code (419) indicating that the resource does not have
-     * sufficient space to record the state of the resource after the
-     * execution of this method.
+     * Status code (419) indicating that the resource does not have sufficient space to record the state of the resource
+     * after the execution of this method.
      */
     public static final int SC_INSUFFICIENT_SPACE_ON_RESOURCE = 419;
     // This one collides with HTTP 1.1
@@ -2538,19 +2512,15 @@ class WebdavStatus {
 
 
     /**
-     * Status code (420) indicating the method was not executed on
-     * a particular resource within its scope because some part of
-     * the method's execution failed causing the entire method to be
-     * aborted.
+     * Status code (420) indicating the method was not executed on a particular resource within its scope because some
+     * part of the method's execution failed causing the entire method to be aborted.
      */
     public static final int SC_METHOD_FAILURE = 420;
 
 
     /**
-     * Status code (423) indicating the destination resource of a
-     * method is locked, and either the request did not contain a
-     * valid Lock-Info header, or the Lock-Info header identifies
-     * a lock held by another principal.
+     * Status code (423) indicating the destination resource of a method is locked, and either the request did not
+     * contain a valid Lock-Info header, or the Lock-Info header identifies a lock held by another principal.
      */
     public static final int SC_LOCKED = 423;
 }


---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org