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 HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)

Browse Source 
59884: Merged V4.2-BUG-FIX (4.2.2) to HEAD-BUG-FIX (Cloud/4.3)
      59611: Merged DEV to V4.2-BUG-FIX
         58117: Added read transactions to Repository's get methods (MNT-9806)


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62201 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alan Davis
2014-02-12 08:14:00 +00:00
parent ac69d90741
commit 3288e9dc06
1 changed files with 47 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

70
source/java/org/alfresco/repo/model/Repository.java
View File

@@ -245,16 +245,24 @@ public class Repository implements ApplicationContextAware
*/ */
public NodeRef getPerson() public NodeRef getPerson()
{ {
NodeRef person = null; RetryingTransactionCallback<NodeRef> callback = new RetryingTransactionCallback<NodeRef>()
String currentUserName = AuthenticationUtil.getRunAsUser();
if (currentUserName != null)
{ {
if (personService.personExists(currentUserName)) @Override
public NodeRef execute() throws Throwable
{ {
person = personService.getPerson(currentUserName); NodeRef person = null;
String currentUserName = AuthenticationUtil.getRunAsUser();
if (currentUserName != null)
{
if (personService.personExists(currentUserName))
{
person = personService.getPerson(currentUserName);
}
}
return person;
} }
} };
return person; return retryingTransactionHelper.doInTransaction(callback, true);
} }
/** /**
@@ -264,16 +272,24 @@ public class Repository implements ApplicationContextAware
*/ */
public NodeRef getFullyAuthenticatedPerson() public NodeRef getFullyAuthenticatedPerson()
{ {
NodeRef person = null; RetryingTransactionCallback<NodeRef> callback = new RetryingTransactionCallback<NodeRef>()
String currentUserName = AuthenticationUtil.getFullyAuthenticatedUser();
if (currentUserName != null)
{ {
if (personService.personExists(currentUserName)) @Override
public NodeRef execute() throws Throwable
{ {
person = personService.getPerson(currentUserName); NodeRef person = null;
String currentUserName = AuthenticationUtil.getFullyAuthenticatedUser();
if (currentUserName != null)
{
if (personService.personExists(currentUserName))
{
person = personService.getPerson(currentUserName);
}
}
return person;
} }
} };
return person; return retryingTransactionHelper.doInTransaction(callback, true);
} }
/** /**
@@ -282,17 +298,25 @@ public class Repository implements ApplicationContextAware
* @param person person * @param person person
* @return user home of person * @return user home of person
*/ */
public NodeRef getUserHome(NodeRef person) public NodeRef getUserHome(final NodeRef person)
{ {
NodeRef homeFolderRef = (NodeRef)nodeService.getProperty(person, ContentModel.PROP_HOMEFOLDER); RetryingTransactionCallback<NodeRef> callback = new RetryingTransactionCallback<NodeRef>()
if (homeFolderRef != null && nodeService.exists(homeFolderRef))
{ {
return homeFolderRef; @Override
} public NodeRef execute() throws Throwable
else {
{ NodeRef homeFolderRef = (NodeRef)nodeService.getProperty(person, ContentModel.PROP_HOMEFOLDER);
return null; if (homeFolderRef != null && nodeService.exists(homeFolderRef))
} {
return homeFolderRef;
}
else
{
return null;
}
}
};
return retryingTransactionHelper.doInTransaction(callback, true);
} }
/** /**