This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/main by this push:
new 6620a894f5 Remove unnecessary code
6620a894f5 is described below
commit 6620a894f5aa2dfb371d8a73514e33b9b817cf15
Author: Mark Thomas <[email protected]>
AuthorDate: Wed Nov 20 17:31:19 2024 +0000
Remove unnecessary code
---
java/org/apache/catalina/servlets/DefaultServlet.java | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/java/org/apache/catalina/servlets/DefaultServlet.java
b/java/org/apache/catalina/servlets/DefaultServlet.java
index 6a4826e7e5..26a3a1daea 100644
--- a/java/org/apache/catalina/servlets/DefaultServlet.java
+++ b/java/org/apache/catalina/servlets/DefaultServlet.java
@@ -1715,7 +1715,7 @@ public class DefaultServlet extends HttpServlet {
sb.append("<table width=\"100%\" cellspacing=\"0\"" + "
cellpadding=\"5\" align=\"center\">\r\n");
SortManager.Order order;
- if (sortListings && null != request) {
+ if (sortListings) {
order = sortManager.getOrder(request.getQueryString());
} else {
order = null;
@@ -1724,7 +1724,7 @@ public class DefaultServlet extends HttpServlet {
sb.append("<thead>\r\n");
sb.append("<tr>\r\n");
sb.append("<th align=\"left\"><font size=\"+1\"><strong>");
- if (sortListings && null != request) {
+ if (sortListings) {
sb.append("<a href=\"?C=N;O=");
sb.append(getOrderChar(order, 'N'));
sb.append("\">");
@@ -1735,7 +1735,7 @@ public class DefaultServlet extends HttpServlet {
}
sb.append("</strong></font></th>\r\n");
sb.append("<th align=\"center\"><font size=\"+1\"><strong>");
- if (sortListings && null != request) {
+ if (sortListings) {
sb.append("<a href=\"?C=S;O=");
sb.append(getOrderChar(order, 'S'));
sb.append("\">");
@@ -1746,7 +1746,7 @@ public class DefaultServlet extends HttpServlet {
}
sb.append("</strong></font></th>\r\n");
sb.append("<th align=\"right\"><font size=\"+1\"><strong>");
- if (sortListings && null != request) {
+ if (sortListings) {
sb.append("<a href=\"?C=M;O=");
sb.append(getOrderChar(order, 'M'));
sb.append("\">");
@@ -1759,7 +1759,7 @@ public class DefaultServlet extends HttpServlet {
sb.append("</tr>\r\n");
sb.append("</thead>\r\n");
- if (null != sortManager && null != request) {
+ if (null != sortManager) {
sortManager.sort(entries, request.getQueryString());
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
