This is an automated email from the ASF dual-hosted git repository. ebourg pushed a commit to branch 9.0.x in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 14f24d1c60bd61b3002120b2b6da1e67a9d4a688 Author: Emmanuel Bourg <ebo...@apache.org> AuthorDate: Wed Dec 2 01:28:25 2020 +0100 Replace Collections.sort() with List.sort() --- java/org/apache/catalina/manager/HTMLManagerServlet.java | 2 +- java/org/apache/catalina/tribes/group/AbsoluteOrder.java | 2 +- java/org/apache/el/stream/Stream.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/java/org/apache/catalina/manager/HTMLManagerServlet.java b/java/org/apache/catalina/manager/HTMLManagerServlet.java index 9447c29..df24a7c 100644 --- a/java/org/apache/catalina/manager/HTMLManagerServlet.java +++ b/java/org/apache/catalina/manager/HTMLManagerServlet.java @@ -957,7 +957,7 @@ public final class HTMLManagerServlet extends ManagerServlet { orderBy = "DESC"; } try { - Collections.sort(sessions, comparator); + sessions.sort(comparator); } catch (IllegalStateException ise) { // at least 1 of the sessions is invalidated req.setAttribute(APPLICATION_ERROR, "Can't sort session list: one session is invalidated"); diff --git a/java/org/apache/catalina/tribes/group/AbsoluteOrder.java b/java/org/apache/catalina/tribes/group/AbsoluteOrder.java index 974c606..20e8b43 100644 --- a/java/org/apache/catalina/tribes/group/AbsoluteOrder.java +++ b/java/org/apache/catalina/tribes/group/AbsoluteOrder.java @@ -58,7 +58,7 @@ public class AbsoluteOrder { public static void absoluteOrder(List<Member> members) { if ( members == null || members.size() <= 1 ) return; - java.util.Collections.sort(members, comp); + members.sort(comp); } public static class AbsoluteComparator implements Comparator<Member>, diff --git a/java/org/apache/el/stream/Stream.java b/java/org/apache/el/stream/Stream.java index 93fd1ad..fd5d168 100644 --- a/java/org/apache/el/stream/Stream.java +++ b/java/org/apache/el/stream/Stream.java @@ -175,7 +175,7 @@ public class Stream { while (iterator.hasNext()) { list.add(iterator.next()); } - Collections.sort(list, c); + list.sort(c); sorted = list.iterator(); } }; --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org