Merged HEAD (5.1) to 5.1.N (5.1.1)

120953 jkaabimofrad: An attempt to fix build failure in Bamboo which appeared by r120912.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@120981 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Ancuta Morarasu
2016-01-18 09:36:54 +00:00
parent 1de7d64a22
commit 2dd522eb64

View File

@@ -413,9 +413,14 @@ public class MultiTDemoTest extends TestCase
String tenantDomain = tenantService.getUserDomain(userName);
// Create groups for tenant
TenantUtil.runAsUserTenant(new TenantRunAsWork<Object>()
TenantUtil.runAsUserTenant(new TenantRunAsWork<Void>()
{
public Object doWork() throws Exception
public Void doWork() throws Exception
{
transactionService.getRetryingTransactionHelper().doInTransaction(new RetryingTransactionCallback<Void>()
{
@Override
public Void execute() throws Throwable
{
// find person
NodeRef personNodeRef = personService.getPerson(userName);
@@ -428,6 +433,9 @@ public class MultiTDemoTest extends TestCase
permissionService.setPermission(homeSpaceRef, "GROUP_" + uniqueGroupNames[i], "Consumer", true);
}
return null;
}
}, false);
return null;
}
}, userName, tenantDomain);