Author: markt
Date: Tue Dec 16 21:52:28 2014
New Revision: 1646101
URL: http://svn.apache.org/r1646101
Log:
Refactor the sync to simply synchronize the method
Modified:
tomcat/trunk/java/org/apache/catalina/authenticator/SingleSignOn.java
tomcat/trunk/java/org/apache/catalina/authenticator/SingleSignOnEntry.java
Modified: tomcat/trunk/java/org/apache/catalina/authenticator/SingleSignOn.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/authenticator/SingleSignOn.java?rev=1646101&r1=1646100&r2=1646101&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/authenticator/SingleSignOn.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/authenticator/SingleSignOn.java Tue
Dec 16 21:52:28 2014
@@ -529,9 +529,7 @@ public class SingleSignOn extends ValveB
containerLog.debug("Update sso id " + ssoId + " to auth type "
+ authType);
}
- synchronized(sso) {
- sso.updateCredentials(principal, authType, username, password);
- }
+ sso.updateCredentials(principal, authType, username, password);
}
}
Modified:
tomcat/trunk/java/org/apache/catalina/authenticator/SingleSignOnEntry.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/authenticator/SingleSignOnEntry.java?rev=1646101&r1=1646100&r2=1646101&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/authenticator/SingleSignOnEntry.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/authenticator/SingleSignOnEntry.java
Tue Dec 16 21:52:28 2014
@@ -172,16 +172,14 @@ public class SingleSignOnEntry
* @param username the username (if any) used for the authentication
* @param password the password (if any) used for the authentication
*/
- public void updateCredentials(Principal principal, String authType,
+ public synchronized void updateCredentials(Principal principal, String
authType,
String username, String password) {
this.principal = principal;
this.authType = authType;
this.username = username;
this.password = password;
- this.canReauthenticate =
- (HttpServletRequest.BASIC_AUTH.equals(authType)
- || HttpServletRequest.FORM_AUTH.equals(authType));
+ this.canReauthenticate =
(HttpServletRequest.BASIC_AUTH.equals(authType) ||
+ HttpServletRequest.FORM_AUTH.equals(authType));
}
-
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
