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 NPE when using guest user in webscripts (ALF-10841)

Browse Source 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@31262 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Derek Hulley
2011-10-17 09:30:24 +00:00
parent a14c0107da
commit 3615b03a74
1 changed files with 17 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
source/java/org/alfresco/repo/model/Repository.java
View File

@@ -44,7 +44,6 @@ import org.alfresco.service.cmr.repository.StoreRef;
import org.alfresco.service.cmr.search.SearchService; import org.alfresco.service.cmr.search.SearchService;
import org.alfresco.service.cmr.security.PersonService; import org.alfresco.service.cmr.security.PersonService;
import org.alfresco.service.namespace.NamespaceService; import org.alfresco.service.namespace.NamespaceService;
import org.springframework.extensions.surf.util.AbstractLifecycleBean;
import org.apache.commons.lang.ArrayUtils; import org.apache.commons.lang.ArrayUtils;
import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.StringUtils;
import org.springframework.beans.BeansException; import org.springframework.beans.BeansException;
@@ -52,7 +51,7 @@ import org.springframework.context.ApplicationContext;
import org.springframework.context.ApplicationContextAware; import org.springframework.context.ApplicationContextAware;
import org.springframework.context.ApplicationEvent; import org.springframework.context.ApplicationEvent;
import org.springframework.context.ApplicationListener; import org.springframework.context.ApplicationListener;
import org.springframework.extensions.surf.util.AbstractLifecycleBean;
/** /**
* Provision of Repository Context * Provision of Repository Context
@@ -280,26 +279,33 @@ public class Repository implements ApplicationContextAware, ApplicationListener,
public NodeRef getUserHome(NodeRef person) public NodeRef getUserHome(NodeRef person)
{ {
NodeRef homeFolderRef = (NodeRef)nodeService.getProperty(person, ContentModel.PROP_HOMEFOLDER); NodeRef homeFolderRef = (NodeRef)nodeService.getProperty(person, ContentModel.PROP_HOMEFOLDER);
return nodeService.exists(homeFolderRef) ? homeFolderRef : null; if (homeFolderRef != null && nodeService.exists(homeFolderRef))
{
return homeFolderRef;
}
else
{
return null;
}
} }
/** /**
* Helper to convert a Web Script Request URL to a Node Ref * Helper to convert a Web Script Request URL to a Node Ref
* * <p/>
* 1) Node - {store_type}/{store_id}/{node_id} * 1) Node - {store_type}/{store_id}/{node_id}
* * <br/>
* Resolve to node via its Node Reference. * Resolve to node via its Node Reference.
* * <br/>
* 2) Path - {store_type}/{store_id}/{path} * 2) Path - {store_type}/{store_id}/{path}
* * <br/>
* Resolve to node via its display path. * Resolve to node via its display path.
* * <br/>
* 3) AVM Path - {store_id}/{path} * 3) AVM Path - {store_id}/{path}
* * <br/>
* Resolve to AVM node via its display path * Resolve to AVM node via its display path
* * <br/>
* 4) QName - {store_type}/{store_id}/{child_qname_path} TODO: Implement * 4) QName - {store_type}/{store_id}/{child_qname_path} TODO: Implement
* * <br/>
* Resolve to node via its child qname path. * Resolve to node via its child qname path.
* *
* @param referenceType one of node, path, avmpath or qname * @param referenceType one of node, path, avmpath or qname