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

Merge V3.4 to HEAD

Browse Source 
23487 : ALF-5539 - Deployment Installer missing I18NUtil
  23607 : ALF-5528 - reworking configuration of "filesystem" target.
  23674 : ALF-5557 - XSS attack occurs on start workflow with XSS properties.
  23684 : ALF-817 - Error occurs when you try to change name of locked file
  24119 : ALF-532 - restore-context.xml.sample is useless

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@24362 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Mark Rogers
2010-12-09 13:31:25 +00:00
parent 9cbca7d313
commit e01738d72c
5 changed files with 40 additions and 120 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
source/java/org/alfresco/repo/avm/MultiTAVMService.java
View File

@@ -865,11 +865,11 @@ public class MultiTAVMService implements AVMService
private String getTenantPath(String avmPath)
{
if ((avmPath == null) || (! isTenantServiceEnabled()))
if ((avmPath == null) || (! isTenantServiceEnabled()) || avmPath.equals("UNKNOWN/UNKNOWN"))
{
return avmPath;
}
String[] storePath = splitPath(avmPath);
return tenantService.getName(storePath[0]) + ':' + storePath[1];
}
@@ -877,11 +877,11 @@ public class MultiTAVMService implements AVMService
private String getBasePath(String avmPath)
{
// note: ALFCOM-2893 - getCommonAncestor can return node with path = "/"
if ((avmPath == null) || (! isTenantServiceEnabled()) || (avmPath.equals("/")))
if ((avmPath == null) || (! isTenantServiceEnabled()) || (avmPath.equals("/")) || avmPath.equals("UNKNOWN/UNKNOWN"))
{
return avmPath;
}
String[] storePath = splitPath(avmPath);
return tenantService.getBaseName(storePath[0]) + ':' + storePath[1];
}