Merge from V3.3-BUG-FIX to HEAD

r. 22803 Merge from DEV/QUITE-RIGHT to HEAD (svn comment typo: should be to V3.3-BUG-FIX)
    r. 22802 Fix for ALF-5040 SiteService.getSite(NodeRef) does not return the correct SiteInfo.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@22804 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Neil McErlean
2010-10-01 10:00:08 +00:00
parent 5de4783dee
commit b6bd5f427c
3 changed files with 16 additions and 5 deletions

View File

@@ -932,16 +932,17 @@ public class SiteServiceImpl implements SiteService, SiteModel
}
/**
* Gets the site node reference for a particular node reference
* This method gets the <code>st:site</code> NodeRef for the Share Site which contains the given NodeRef.
* If the given NodeRef is not contained within a Share Site, then <code>null</code> is returned.
*
* @param nodeRef node reference
* @param nodeRef the node whose containing site is to be found.
* @return NodeRef site node reference or null if node is not in a site
*/
private NodeRef getSiteNodeRef(NodeRef nodeRef)
{
NodeRef siteNodeRef = null;
QName nodeRefType = nodeService.getType(nodeRef);
if (dictionaryService.isSubClass(TYPE_SITE, nodeRefType) == true)
if (dictionaryService.isSubClass(nodeRefType, TYPE_SITE) == true)
{
siteNodeRef = nodeRef;
}