Author: rjung Date: Wed Nov 26 17:40:33 2014 New Revision: 1641868 URL: http://svn.apache.org/r1641868 Log: Merged revision 1178684 from tomcat/trunk: In GenericPrincipal, SerializablePrincipal: Do not sort lists that have only one element
Backport of r1195564 from TC 6. Modified: tomcat/sandbox/tomcat-oacc/trunk/docs/changelog.xml tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/SerializablePrincipal.java Modified: tomcat/sandbox/tomcat-oacc/trunk/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/sandbox/tomcat-oacc/trunk/docs/changelog.xml?rev=1641868&r1=1641867&r2=1641868&view=diff ============================================================================== --- tomcat/sandbox/tomcat-oacc/trunk/docs/changelog.xml (original) +++ tomcat/sandbox/tomcat-oacc/trunk/docs/changelog.xml Wed Nov 26 17:40:33 2014 @@ -31,6 +31,10 @@ <body> <section name="Tomcat OACC 0.1 (rjung)"> <subsection name="Cluster"> + <update> + In GenericPrincipal, SerializablePrincipal: Do not sort lists of roles + that have only one element. (kkolinko) + </update> <add> New cluster manager attribute <code>sessionAttributeFilter</code> allows to filter which session attributes are replicated using a Modified: tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/SerializablePrincipal.java URL: http://svn.apache.org/viewvc/tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/SerializablePrincipal.java?rev=1641868&r1=1641867&r2=1641868&view=diff ============================================================================== --- tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/SerializablePrincipal.java (original) +++ tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/SerializablePrincipal.java Wed Nov 26 17:40:33 2014 @@ -110,7 +110,7 @@ public class SerializablePrincipal impl 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) { --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org