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 problem with category editing found by Mike

Browse Source 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@8578 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Gavin Cornwell
2008-03-20 12:04:23 +00:00
parent 66861b8310
commit 0cbd2dce3f
2 changed files with 2 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
source/java/org/alfresco/web/bean/BaseDetailsBean.java
View File

@@ -41,7 +41,6 @@ import org.alfresco.repo.transaction.RetryingTransactionHelper.RetryingTransacti
import org.alfresco.service.cmr.repository.CopyService; import org.alfresco.service.cmr.repository.CopyService;
import org.alfresco.service.cmr.repository.FileTypeImageSize; import org.alfresco.service.cmr.repository.FileTypeImageSize;
import org.alfresco.service.cmr.repository.NodeRef; import org.alfresco.service.cmr.repository.NodeRef;
import org.alfresco.service.cmr.repository.NodeService;
import org.alfresco.service.cmr.repository.TemplateImageResolver; import org.alfresco.service.cmr.repository.TemplateImageResolver;
import org.alfresco.service.cmr.security.AccessStatus; import org.alfresco.service.cmr.security.AccessStatus;
import org.alfresco.service.cmr.security.OwnableService; import org.alfresco.service.cmr.security.OwnableService;
@@ -68,15 +67,6 @@ public abstract class BaseDetailsBean extends BaseDialogBean
{ {
private static final String MSG_SUCCESS_OWNERSHIP = "success_ownership"; private static final String MSG_SUCCESS_OWNERSHIP = "success_ownership";
/** BrowseBean instance */
protected BrowseBean browseBean;
/** The NavigationBean bean reference */
protected NavigationBean navigator;
/** NodeServuce bean reference */
transient private NodeService nodeService;
/** OwnableService bean reference */ /** OwnableService bean reference */
transient private OwnableService ownableService; transient private OwnableService ownableService;
@@ -108,41 +98,6 @@ public abstract class BaseDetailsBean extends BaseDialogBean
// ------------------------------------------------------------------------------ // ------------------------------------------------------------------------------
// Bean property getters and setters // Bean property getters and setters
/**
* Sets the BrowseBean instance to use to retrieve the current node
*
* @param browseBean BrowseBean instance
*/
public void setBrowseBean(BrowseBean browseBean)
{
this.browseBean = browseBean;
}
/**
* @param navigator The NavigationBean to set.
*/
public void setNavigator(NavigationBean navigator)
{
this.navigator = navigator;
}
/**
* @param nodeService The NodeService to set
*/
public void setNodeService(NodeService nodeService)
{
this.nodeService = nodeService;
}
protected NodeService getNodeService()
{
if (nodeService == null)
{
nodeService = Repository.getServiceRegistry(FacesContext.getCurrentInstance()).getNodeService();
}
return nodeService;
}
/** /**
* Sets the ownable service instance the bean should use * Sets the ownable service instance the bean should use
* *

1
source/java/org/alfresco/web/bean/repository/MapNode.java
View File

@@ -143,6 +143,7 @@ public class MapNode extends Node implements Map<String, Object>
props.put("id", this.getId()); props.put("id", this.getId());
props.put("name", this.getName()); // TODO: perf test pulling back single prop here instead of all! props.put("name", this.getName()); // TODO: perf test pulling back single prop here instead of all!
props.put("nodeRef", this.getNodeRef()); props.put("nodeRef", this.getNodeRef());
props.put("nodeRefAsString", this.getNodeRefAsString());
propsInitialised = true; propsInitialised = true;
} }