[Jboss-cvs] JBossAS SVN: r55965 - branches/JBoss_3_2_7_CP/tomcat/src/main/org/jboss/web/tomcat/security

[jboss-cvs-commits at lists.jboss.org]

Author: ryan.campbell at jboss.com
Date: 2006-08-15 12:22:12 -0400 (Tue, 15 Aug 2006)
New Revision: 55965

Modified:
   branches/JBoss_3_2_7_CP/tomcat/src/main/org/jboss/web/tomcat/security/JBossSecurityMgrRealm.java
Log:
merged JBAS-2469: Integrate JBAS-1456 into 3.2.7 patch for security cache problem

Modified: branches/JBoss_3_2_7_CP/tomcat/src/main/org/jboss/web/tomcat/security/JBossSecurityMgrRealm.java
===================================================================
--- branches/JBoss_3_2_7_CP/tomcat/src/main/org/jboss/web/tomcat/security/JBossSecurityMgrRealm.java	2006-08-15 16:08:58 UTC (rev 55964)
+++ branches/JBoss_3_2_7_CP/tomcat/src/main/org/jboss/web/tomcat/security/JBossSecurityMgrRealm.java	2006-08-15 16:22:12 UTC (rev 55965)
@@ -233,13 +233,10 @@
          // Get the JBoss security manager from the ENC context
          SubjectSecurityManager securityMgr = (SubjectSecurityManager) securityCtx.lookup("securityMgr");
          principal = new SimplePrincipal(username);
-         char[] passwordChars = null;
-         if (credentials != null)
-            passwordChars = credentials.toCharArray();
-         if (securityMgr.isValid(principal, passwordChars))
+         if (securityMgr.isValid(principal, credentials))
          {
             log.trace("User: " + username + " is authenticated");
-            SecurityAssociationActions.setPrincipalInfo(principal, passwordChars);
+            SecurityAssociationActions.setPrincipalInfo(principal, credentials);
             // Get the CallerPrincipal mapping
             RealmMapping realmMapping = (RealmMapping) securityCtx.lookup("realmMapping");
             Principal oldPrincipal = principal;