mirror of
https://github.com/Alfresco/alfresco-community-repo.git
synced 2025-08-07 17:49:17 +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,17 +334,16 @@ public class InMemoryTicketComponentImpl implements TicketComponent
|
|||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Has the tick expired
|
* Has the ticket expired
|
||||||
*
|
*
|
||||||
* @return - if expired
|
* @return - if expired
|
||||||
*/
|
*/
|
||||||
boolean hasExpired()
|
boolean hasExpired()
|
||||||
{
|
{
|
||||||
Date now = new Date();
|
|
||||||
switch (expires)
|
switch (expires)
|
||||||
{
|
{
|
||||||
case AFTER_FIXED_TIME:
|
case AFTER_FIXED_TIME:
|
||||||
if ((expiryDate != null) && (expiryDate.compareTo(now) < 0))
|
if ((expiryDate != null) && (expiryDate.compareTo(new Date()) < 0))
|
||||||
{
|
{
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
@@ -352,7 +351,9 @@ public class InMemoryTicketComponentImpl implements TicketComponent
|
|||||||
{
|
{
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
case AFTER_INACTIVITY:
|
case AFTER_INACTIVITY:
|
||||||
|
Date now = new Date();
|
||||||
if ((expiryDate != null) && (expiryDate.compareTo(now) < 0))
|
if ((expiryDate != null) && (expiryDate.compareTo(now) < 0))
|
||||||
{
|
{
|
||||||
return true;
|
return true;
|
||||||
@@ -362,11 +363,11 @@ public class InMemoryTicketComponentImpl implements TicketComponent
|
|||||||
expiryDate = Duration.add(now, validDuration);
|
expiryDate = Duration.add(now, validDuration);
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
case DO_NOT_EXPIRE:
|
case DO_NOT_EXPIRE:
|
||||||
default:
|
default:
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public boolean equals(Object o)
|
public boolean equals(Object o)
|
||||||
|
Reference in New Issue
Block a user