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

Fix WorkflowTestSuite

Browse Source 
- fallout from r30993 (and earlier r30270) - we should never have null tenant domain

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@31026 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Jan Vonka
2011-10-07 08:29:01 +00:00
parent 1520fbe1d9
commit cea3e35b55
1 changed files with 1 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
source/java/org/alfresco/repo/workflow/WorkflowObjectFactory.java
View File

@@ -334,7 +334,6 @@ public class WorkflowObjectFactory
public <T extends Object> List<T> filterByDomain(Collection<T> values, final Function<T, String> processKeyGetter) public <T extends Object> List<T> filterByDomain(Collection<T> values, final Function<T, String> processKeyGetter)
{ {
final boolean enabled = tenantService.isEnabled();
final String currentDomain = tenantService.getCurrentUserDomain(); final String currentDomain = tenantService.getCurrentUserDomain();
return CollectionUtils.filter(values, new Filter<T>() return CollectionUtils.filter(values, new Filter<T>()
{ {
@@ -342,18 +341,7 @@ public class WorkflowObjectFactory
{ {
String key = processKeyGetter.apply(value); String key = processKeyGetter.apply(value);
String domain = tenantService.getDomain(key, false); String domain = tenantService.getDomain(key, false);
if(enabled) return (currentDomain.equals(domain));
{
if(currentDomain.equals(domain))
{
return true; // The domains match so include.
}
}
else if(domain==null)
{
return true; // In single-tenant mode only return items with no domain.
}
return false;
} }
}); });
} }