inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-07 17:49:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged DEV to HEAD [ALF-19301, CLOUD-1685]:

Browse Source 
52798: Replaced 'new Date()' with 'System.currentTimeMillis()' to avoid the Calendar initialization overhead


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@55089 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Derek Hulley
2013-09-08 21:57:49 +00:00
parent f0372eca64
commit ec38064cbb
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
source/java/org/alfresco/repo/security/authentication/RepositoryAuthenticationDao.java
View File

@@ -167,7 +167,7 @@ public class RepositoryAuthenticationDao implements MutableAuthenticationDao, In
throw new UsernameNotFoundException("Could not find user by userName: " + incomingUserName); throw new UsernameNotFoundException("Could not find user by userName: " + incomingUserName);
} }
UserDetails userDetails = userEntry.userDetails; UserDetails userDetails = userEntry.userDetails;
if (userEntry.credentialExpiryDate == null || userEntry.credentialExpiryDate.compareTo(new Date()) >= 0) if (userEntry.credentialExpiryDate == null || userEntry.credentialExpiryDate.getTime() >= System.currentTimeMillis())
{ {
return userDetails; return userDetails;
} }
@@ -213,7 +213,7 @@ public class RepositoryAuthenticationDao implements MutableAuthenticationDao, In
boolean isAdminAuthority = authorityService.isAdminAuthority(userName); boolean isAdminAuthority = authorityService.isAdminAuthority(userName);
Date credentialsExpiryDate = getCredentialsExpiryDate(userName, properties, isAdminAuthority); Date credentialsExpiryDate = getCredentialsExpiryDate(userName, properties, isAdminAuthority);
boolean credentialsHaveNotExpired = (credentialsExpiryDate == null || credentialsExpiryDate.compareTo(new Date()) >= 0); boolean credentialsHaveNotExpired = (credentialsExpiryDate == null || credentialsExpiryDate.getTime() >= System.currentTimeMillis());
UserDetails ud = new User( UserDetails ud = new User(
userName, userName,
@@ -456,7 +456,7 @@ public class RepositoryAuthenticationDao implements MutableAuthenticationDao, In
} }
else else
{ {
return (date.compareTo(new Date()) < 1); return (date.getTime() < System.currentTimeMillis());
} }
} }
else else
@@ -578,7 +578,7 @@ public class RepositoryAuthenticationDao implements MutableAuthenticationDao, In
protected boolean getCredentialsHaveExpired(String userName, Map<QName, Serializable> properties, Boolean isAdminAuthority) protected boolean getCredentialsHaveExpired(String userName, Map<QName, Serializable> properties, Boolean isAdminAuthority)
{ {
Date credentialsExpiryDate = getCredentialsExpiryDate(userName, properties, isAdminAuthority); Date credentialsExpiryDate = getCredentialsExpiryDate(userName, properties, isAdminAuthority);
boolean credentialsHaveNotExpired = (credentialsExpiryDate == null || credentialsExpiryDate.compareTo(new Date()) >= 0); boolean credentialsHaveNotExpired = (credentialsExpiryDate == null || credentialsExpiryDate.getTime() >= System.currentTimeMillis());
return (! credentialsHaveNotExpired); return (! credentialsHaveNotExpired);
} }