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

Fixed failing Activiti Workflow tests.

Browse Source 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@31073 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
N Smith
2011-10-10 10:55:51 +00:00
parent 82469c674f
commit 002183da91
2 changed files with 19 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
source/java/org/alfresco/repo/tenant/MultiTServiceImpl.java
View File

@@ -605,6 +605,23 @@ public class MultiTServiceImpl implements TenantService
return nameDomain; return nameDomain;
} }
public static String getMultiTenantDomainName(String name)
{
// Check that all the passed values are not null
ParameterCheck.mandatory("name", name);
int idx1 = name.indexOf(SEPARATOR);
if (idx1 == 0)
{
int idx2 = name.indexOf(SEPARATOR, 1);
if (idx2 != -1)
{
return name.substring(1, idx2);
}
}
return DEFAULT_DOMAIN;
}
/* (non-Javadoc) /* (non-Javadoc)
* @see org.alfresco.repo.tenant.TenantUserService#getDomainUser(java.lang.String, java.lang.String) * @see org.alfresco.repo.tenant.TenantUserService#getDomainUser(java.lang.String, java.lang.String)
*/ */

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

@@ -27,6 +27,7 @@ import java.util.Map;
import org.alfresco.repo.i18n.MessageService; import org.alfresco.repo.i18n.MessageService;
import org.alfresco.repo.jscript.ScriptNode; import org.alfresco.repo.jscript.ScriptNode;
import org.alfresco.repo.tenant.MultiTServiceImpl;
import org.alfresco.repo.tenant.TenantService; import org.alfresco.repo.tenant.TenantService;
import org.alfresco.service.cmr.dictionary.DictionaryService; import org.alfresco.service.cmr.dictionary.DictionaryService;
import org.alfresco.service.cmr.dictionary.TypeDefinition; import org.alfresco.service.cmr.dictionary.TypeDefinition;
@@ -340,7 +341,7 @@ public class WorkflowObjectFactory
public Boolean apply(T value) public Boolean apply(T value)
{ {
String key = processKeyGetter.apply(value); String key = processKeyGetter.apply(value);
String domain = tenantService.getDomain(key, false); String domain = MultiTServiceImpl.getMultiTenantDomainName(key);
return (currentDomain.equals(domain)); return (currentDomain.equals(domain));
} }
}); });