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

Tenant Service hooks for LockService, FileFolderService and other MT fixes (DbNodeService & AuthorityService)

Browse Source 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@6437 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Jan Vonka
2007-08-07 08:40:25 +00:00
parent e0f2b295af
commit 9ed7b186f0
6 changed files with 50 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
source/java/org/alfresco/repo/lock/LockServiceImpl.java
View File

@@ -41,6 +41,7 @@ import org.alfresco.repo.policy.JavaBehaviour;
import org.alfresco.repo.policy.PolicyComponent;
import org.alfresco.repo.policy.PolicyScope;
import org.alfresco.repo.security.authentication.AuthenticationUtil;
import org.alfresco.repo.tenant.TenantService;
import org.alfresco.repo.version.VersionServicePolicies;
import org.alfresco.service.cmr.lock.LockService;
import org.alfresco.service.cmr.lock.LockStatus;
@@ -77,6 +78,11 @@ public class LockServiceImpl implements LockService,
* The node service
*/
private NodeService nodeService;
/**
* The tenant service
*/
private TenantService tenantService;
/**
* The policy component
@@ -114,6 +120,17 @@ public class LockServiceImpl implements LockService,
{
this.nodeService = nodeService;
}
/**
* Set the tenant service
*
* @param tenantService
* the tenant service
*/
public void setTenantService(TenantService tenantService)
{
this.tenantService = tenantService;
}
/**
* Sets the policy component
@@ -208,6 +225,8 @@ public class LockServiceImpl implements LockService,
*/
public synchronized void lock(NodeRef nodeRef, LockType lockType, int timeToExpire)
{
nodeRef = tenantService.getName(nodeRef);
// Check for lock aspect
checkForLockApsect(nodeRef);
@@ -303,6 +322,8 @@ public class LockServiceImpl implements LockService,
*/
public synchronized void unlock(NodeRef nodeRef) throws UnableToReleaseLockException
{
nodeRef = tenantService.getName(nodeRef);
// Check for lock aspect
checkForLockApsect(nodeRef);
@@ -357,6 +378,8 @@ public class LockServiceImpl implements LockService,
*/
public LockStatus getLockStatus(NodeRef nodeRef)
{
nodeRef = tenantService.getName(nodeRef);
return getLockStatus(nodeRef, getUserName());
}
@@ -445,6 +468,8 @@ public class LockServiceImpl implements LockService,
public void checkForLock(NodeRef nodeRef) throws NodeLockedException
{
String userName = getUserName();
nodeRef = tenantService.getName(nodeRef);
// Ensure we have found a node reference
if (nodeRef != null && userName != null)