mirror of
https://github.com/Alfresco/alfresco-community-repo.git
synced 2025-07-31 17:39:05 +00:00
Merged V3.0 to HEAD
11355: NTLMLogoDetails and Type2NTLMMessage are now Serializable, as they may be stored in an HTTP session. JLAN-43. 11386: Refactor of repository tier NTLM authentication filters. 11387: Integration of NTLMv2 message support for NTLM authentication filters 11400: Fixed NTLMv2 detection for Firefox, it does not send the 128Bit flag. 11401: Second round of NTLM authentication filter refactoring for repo tier. git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@12425 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
@@ -334,39 +334,40 @@ public class InMemoryTicketComponentImpl implements TicketComponent
|
||||
}
|
||||
|
||||
/**
|
||||
* Has the tick expired
|
||||
* Has the ticket expired
|
||||
*
|
||||
* @return - if expired
|
||||
*/
|
||||
boolean hasExpired()
|
||||
{
|
||||
Date now = new Date();
|
||||
switch (expires)
|
||||
{
|
||||
case AFTER_FIXED_TIME:
|
||||
if ((expiryDate != null) && (expiryDate.compareTo(now) < 0))
|
||||
{
|
||||
return true;
|
||||
}
|
||||
else
|
||||
{
|
||||
case AFTER_FIXED_TIME:
|
||||
if ((expiryDate != null) && (expiryDate.compareTo(new Date()) < 0))
|
||||
{
|
||||
return true;
|
||||
}
|
||||
else
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
case AFTER_INACTIVITY:
|
||||
Date now = new Date();
|
||||
if ((expiryDate != null) && (expiryDate.compareTo(now) < 0))
|
||||
{
|
||||
return true;
|
||||
}
|
||||
else
|
||||
{
|
||||
expiryDate = Duration.add(now, validDuration);
|
||||
return false;
|
||||
}
|
||||
|
||||
case DO_NOT_EXPIRE:
|
||||
default:
|
||||
return false;
|
||||
}
|
||||
case AFTER_INACTIVITY:
|
||||
if ((expiryDate != null) && (expiryDate.compareTo(now) < 0))
|
||||
{
|
||||
return true;
|
||||
}
|
||||
else
|
||||
{
|
||||
expiryDate = Duration.add(now, validDuration);
|
||||
return false;
|
||||
}
|
||||
case DO_NOT_EXPIRE:
|
||||
default:
|
||||
return false;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
public boolean equals(Object o)
|
||||
|
Reference in New Issue
Block a user