This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/master by this push:
new c7f904b Format. No functional change.
c7f904b is described below
commit c7f904bc1a65c1cf93cc2b590974ebb1e8bbba8e
Author: Mark Thomas <[email protected]>
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 3acf5e8..05ceabd 100644
--- a/java/org/apache/catalina/servlets/DefaultServlet.java
+++ b/java/org/apache/catalina/servlets/DefaultServlet.java
@@ -2619,6 +2619,7 @@ public class DefaultServlet extends HttpServlet {
}
}
+
private static class PrecompressedResource {
public final WebResource resource;
public final CompressionFormat format;
@@ -2629,6 +2630,7 @@ public class DefaultServlet extends HttpServlet {
}
}
+
/**
* This is secure in the sense that any attempt to use an external entity
* will trigger an exception.
@@ -2658,6 +2660,7 @@ public class DefaultServlet extends HttpServlet {
}
}
+
/**
* Gets the ordering character to be used for a particular column.
*
@@ -2679,11 +2682,11 @@ public class DefaultServlet extends HttpServlet {
}
}
+
/**
* A class encapsulating the sorting of resources.
*/
- private static class SortManager
- {
+ private static class SortManager {
/**
* The default sort.
*/
@@ -2871,9 +2874,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) {
@@ -2896,18 +2898,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) {
@@ -2925,9 +2924,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: [email protected]
For additional commands, e-mail: [email protected]
