From bbe7b7405719f8ab2c09267e8c1bc910a47408e2 Mon Sep 17 00:00:00 2001 From: kkolinko Date: Tue, 4 Oct 2011 05:07:52 +0000 Subject: [PATCH] Do not sort lists that have only one element git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1178684 13f79535-47bb-0310-9956-ffa450edef68 --- java/org/apache/catalina/ha/session/SerializablePrincipal.java | 2 +- java/org/apache/catalina/realm/GenericPrincipal.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/java/org/apache/catalina/ha/session/SerializablePrincipal.java b/java/org/apache/catalina/ha/session/SerializablePrincipal.java index 5955791a5..5d1101fd4 100644 --- a/java/org/apache/catalina/ha/session/SerializablePrincipal.java +++ b/java/org/apache/catalina/ha/session/SerializablePrincipal.java @@ -108,7 +108,7 @@ public class SerializablePrincipal implements java.io.Serializable { if (roles != null) { this.roles = new String[roles.size()]; this.roles = roles.toArray(this.roles); - if (this.roles.length > 0) + if (this.roles.length > 1) Arrays.sort(this.roles); } if (userPrincipal instanceof Serializable) { diff --git a/java/org/apache/catalina/realm/GenericPrincipal.java b/java/org/apache/catalina/realm/GenericPrincipal.java index 6b45faf26..7a3a086f3 100644 --- a/java/org/apache/catalina/realm/GenericPrincipal.java +++ b/java/org/apache/catalina/realm/GenericPrincipal.java @@ -127,7 +127,7 @@ public class GenericPrincipal implements Principal { if (roles != null) { this.roles = new String[roles.size()]; this.roles = roles.toArray(this.roles); - if (this.roles.length > 0) + if (this.roles.length > 1) Arrays.sort(this.roles); } this.loginContext = loginContext; -- 2.11.0