[tomcat] branch 8.5.x updated: Format. No functional change.

[markt]

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

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


The following commit(s) were added to refs/heads/8.5.x by this push:
     new 2ea2421  Format. No functional change.
2ea2421 is described below

commit 2ea24216520c9b7ddbcf0d3c52321d88e191cc47
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Wed May 19 09:29:23 2021 +0100

    Format. No functional change.
---
 .../apache/catalina/servlets/DefaultServlet.java   | 25 ++++++++++------------
 1 file changed, 11 insertions(+), 14 deletions(-)

diff --git a/java/org/apache/catalina/servlets/DefaultServlet.java 
b/java/org/apache/catalina/servlets/DefaultServlet.java
index 862f2d1..8ab6bbe 100644
--- a/java/org/apache/catalina/servlets/DefaultServlet.java
+++ b/java/org/apache/catalina/servlets/DefaultServlet.java
@@ -2824,6 +2824,7 @@ public class DefaultServlet extends HttpServlet {
         }
     }
 
+
     private static class PrecompressedResource {
         public final WebResource resource;
         public final CompressionFormat format;
@@ -2834,6 +2835,7 @@ public class DefaultServlet extends HttpServlet {
         }
     }
 
+
     /**
      * This is secure in the sense that any attempt to use an external entity
      * will trigger an exception.
@@ -2863,6 +2865,7 @@ public class DefaultServlet extends HttpServlet {
         }
     }
 
+
     /**
      * Gets the ordering character to be used for a particular column.
      *
@@ -2884,11 +2887,11 @@ public class DefaultServlet extends HttpServlet {
         }
     }
 
+
     /**
      * A class encapsulating the sorting of resources.
      */
-    private static class SortManager
-    {
+    private static class SortManager {
         /**
          * The default sort.
          */
@@ -3076,9 +3079,8 @@ public class DefaultServlet extends HttpServlet {
         }
     }
 
-    private static class DirsFirstComparator
-        implements Comparator<WebResource>
-    {
+
+    private static class DirsFirstComparator implements 
Comparator<WebResource> {
         private final Comparator<WebResource> base;
 
         public DirsFirstComparator(Comparator<WebResource> core) {
@@ -3101,18 +3103,15 @@ public class DefaultServlet extends HttpServlet {
         }
     }
 
-    private static class ResourceNameComparator
-        implements Comparator<WebResource>
-    {
+    private static class ResourceNameComparator implements 
Comparator<WebResource> {
         @Override
         public int compare(WebResource r1, WebResource r2) {
             return r1.getName().compareTo(r2.getName());
         }
     }
 
-    private static class ResourceSizeComparator
-        implements Comparator<WebResource>
-    {
+
+    private static class ResourceSizeComparator implements 
Comparator<WebResource> {
         private Comparator<WebResource> base;
 
         public ResourceSizeComparator(Comparator<WebResource> base) {
@@ -3130,9 +3129,7 @@ public class DefaultServlet extends HttpServlet {
         }
     }
 
-    private static class ResourceLastModifiedDateComparator
-        implements Comparator<WebResource>
-    {
+    private static class ResourceLastModifiedDateComparator implements 
Comparator<WebResource> {
         private Comparator<WebResource> base;
 
         public ResourceLastModifiedDateComparator(Comparator<WebResource> 
base) {

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