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 6801339 Format. No functional change.
6801339 is described below
commit 6801339e728ec799a108b73790884a4dd228dda4
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 e0b6711..3c135f8 100644
--- a/java/org/apache/catalina/servlets/DefaultServlet.java
+++ b/java/org/apache/catalina/servlets/DefaultServlet.java
@@ -2701,6 +2701,7 @@ public class DefaultServlet extends HttpServlet {
}
}
+
private static class PrecompressedResource {
public final WebResource resource;
public final CompressionFormat format;
@@ -2711,6 +2712,7 @@ public class DefaultServlet extends HttpServlet {
}
}
+
/**
* This is secure in the sense that any attempt to use an external entity
* will trigger an exception.
@@ -2740,6 +2742,7 @@ public class DefaultServlet extends HttpServlet {
}
}
+
/**
* Gets the ordering character to be used for a particular column.
*
@@ -2761,11 +2764,11 @@ public class DefaultServlet extends HttpServlet {
}
}
+
/**
* A class encapsulating the sorting of resources.
*/
- private static class SortManager
- {
+ private static class SortManager {
/**
* The default sort.
*/
@@ -2953,9 +2956,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) {
@@ -2978,18 +2980,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) {
@@ -3007,9 +3006,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]
