Author: markt
Date: Fri Dec 19 14:32:08 2014
New Revision: 1646731
URL: http://svn.apache.org/r1646731
Log:
Clean-up. No functional change
Modified:
tomcat/tc8.0.x/trunk/ (props changed)
tomcat/tc8.0.x/trunk/java/org/apache/catalina/realm/GenericPrincipal.java
Propchange: tomcat/tc8.0.x/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Dec 19 14:32:08 2014
@@ -1 +1 @@
-/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886,1644890,1644892
,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1646302,1646304,1646420
+/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886,1644890,1644892
,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645952,1646302,1646304,1646420
Modified:
tomcat/tc8.0.x/trunk/java/org/apache/catalina/realm/GenericPrincipal.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/realm/GenericPrincipal.java?rev=1646731&r1=1646730&r2=1646731&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/java/org/apache/catalina/realm/GenericPrincipal.java
(original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/catalina/realm/GenericPrincipal.java
Fri Dec 19 14:32:08 2014
@@ -14,11 +14,8 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
-
package org.apache.catalina.realm;
-
import java.security.Principal;
import java.util.Arrays;
import java.util.List;
@@ -28,7 +25,6 @@ import javax.security.auth.login.LoginCo
import org.apache.catalina.TomcatPrincipal;
import org.ietf.jgss.GSSCredential;
-
/**
* Generic implementation of <strong>java.security.Principal</strong> that
* is available for use by <code>Realm</code> implementations.
@@ -37,7 +33,6 @@ import org.ietf.jgss.GSSCredential;
*/
public class GenericPrincipal implements TomcatPrincipal {
-
// ----------------------------------------------------------- Constructors
/**
@@ -112,16 +107,16 @@ public class GenericPrincipal implements
this.roles = new String[0];
} else {
this.roles = roles.toArray(new String[roles.size()]);
- if (this.roles.length > 1)
+ if (this.roles.length > 1) {
Arrays.sort(this.roles);
+ }
}
this.loginContext = loginContext;
this.gssCredential = gssCredential;
}
- // ------------------------------------------------------------- Properties
-
+ // --------------------------------------------------------------
Properties
/**
* The username of the user represented by this Principal.
@@ -130,7 +125,7 @@ public class GenericPrincipal implements
@Override
public String getName() {
- return (this.name);
+ return this.name;
}
@@ -141,7 +136,7 @@ public class GenericPrincipal implements
protected final String password;
public String getPassword() {
- return (this.password);
+ return this.password;
}
@@ -151,7 +146,7 @@ public class GenericPrincipal implements
protected final String roles[];
public String[] getRoles() {
- return (this.roles);
+ return this.roles;
}
@@ -190,22 +185,25 @@ public class GenericPrincipal implements
this.gssCredential = gssCredential;
}
- // --------------------------------------------------------- Public Methods
+ // ---------------------------------------------------------- Public
Methods
/**
* Does the user represented by this Principal possess the specified role?
*
* @param role Role to be tested
+ *
+ * @return <code>true</code> if this Principal has been assigned the given
+ * role, otherwise <code>false</code>
*/
public boolean hasRole(String role) {
-
- if("*".equals(role)) // Special 2.4 role meaning everyone
+ if ("*".equals(role)) {// Special 2.4 role meaning everyone
return true;
- if (role == null)
- return (false);
- return (Arrays.binarySearch(roles, role) >= 0);
-
+ }
+ if (role == null) {
+ return false;
+ }
+ return Arrays.binarySearch(roles, role) >= 0;
}
@@ -215,16 +213,14 @@ public class GenericPrincipal implements
*/
@Override
public String toString() {
-
StringBuilder sb = new StringBuilder("GenericPrincipal[");
sb.append(this.name);
sb.append("(");
- for( int i=0;i<roles.length; i++ ) {
+ for (int i = 0; i < roles.length; i++ ) {
sb.append( roles[i]).append(",");
}
sb.append(")]");
- return (sb.toString());
-
+ return sb.toString();
}
@@ -236,7 +232,6 @@ public class GenericPrincipal implements
* to allow for future expansion of this method to cover
* other logout mechanisms that might throw a different
* exception to LoginContext
- *
*/
@Override
public void logout() throws Exception {
@@ -244,7 +239,4 @@ public class GenericPrincipal implements
loginContext.logout();
}
}
-
-
-
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
