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

ALF-13028: Sharepoint broken by changes to WebDAV

Browse Source 
Integrated fix for ALF-11777 so that locks are not kept for more than 24 hours and 24 hour or infinite locks are dropped on user's session destruction.

Extracted interface from WebDAVLockService and moved the implementation to WebDAVLockServiceImpl. Modified WebDAVLockServiceImpl to use the LockStore in-memory locking. WebDAV and SPP use WebDAVLockService instead of directly using LockStore.

 


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@35486 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Matt Ward
2012-04-20 14:33:19 +00:00
parent 617e6486cc
commit 004b2c5e60
12 changed files with 854 additions and 358 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
source/java/org/alfresco/repo/webdav/LockInfoImpl.java
View File

@@ -33,7 +33,7 @@ import java.util.concurrent.locks.ReentrantReadWriteLock;
* @author Ivan Rybnikov
*
*/
public final class LockInfoImpl implements Serializable, LockInfo
public class LockInfoImpl implements Serializable, LockInfo
{
private static final long serialVersionUID = 1L;
@@ -262,7 +262,7 @@ public final class LockInfoImpl implements Serializable, LockInfo
{
return false;
}
Date now = new Date();
Date now = dateNow();
return now.after(expires);
}
@@ -321,6 +321,25 @@ public final class LockInfoImpl implements Serializable, LockInfo
return expires;
}
/**
* Remaining time before lock expires, in seconds.
*/
@Override
public long getRemainingTimeoutSeconds()
{
Date expires = getExpires();
if (expires == null)
{
return WebDAV.TIMEOUT_INFINITY;
}
else
{
Date now = dateNow();
long timeout = ((expires.getTime() - now.getTime()) / 1000);
return timeout;
}
}
/**
* Sanity check the state of this LockInfo.
*/
@@ -336,21 +355,50 @@ public final class LockInfoImpl implements Serializable, LockInfo
* Sets the expiry date/time to lockTimeout seconds into the future. Provide
* a lockTimeout of WebDAV.TIMEOUT_INFINITY for never expires.
*
* @param lockTimeout
* @param lockTimeoutSecs
*/
@Override
public void setTimeoutSeconds(int lockTimeout)
public void setTimeoutSeconds(int lockTimeoutSecs)
{
if (lockTimeout == WebDAV.TIMEOUT_INFINITY)
if (lockTimeoutSecs == WebDAV.TIMEOUT_INFINITY)
{
setExpires(null);
}
else
{
int timeoutMillis = (lockTimeout * 60 * 1000);
Date now = new Date();
int timeoutMillis = (lockTimeoutSecs * 1000);
Date now = dateNow();
Date nextExpiry = new Date(now.getTime() + timeoutMillis);
setExpires(nextExpiry);
}
}
/**
* Sets the expiry date/time to lockTimeout minutes into the future. Provide
* a lockTimeout of WebDAV.TIMEOUT_INFINITY for never expires.
*
* @param lockTimeoutMins
*/
@Override
public void setTimeoutMinutes(int lockTimeoutMins)
{
if (lockTimeoutMins != WebDAV.TIMEOUT_INFINITY)
{
setTimeoutSeconds(lockTimeoutMins * 60);
}
else
{
setTimeoutSeconds(WebDAV.TIMEOUT_INFINITY);
}
}
/**
* Hook to allow unit testing - gets the current date/time.
*
* @return Date
*/
protected Date dateNow()
{
return new Date();
}
}