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 for invalid nodes; check for null 'nodeInfo.getType()'

Browse Source 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@32123 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Derek Hulley
2011-11-20 21:41:30 +00:00
parent 37edc9916a
commit beaec01727
1 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
source/java/org/alfresco/opencmis/mapping/DirectProperty.java
View File

@@ -26,8 +26,7 @@ import org.alfresco.service.ServiceRegistry;
import org.alfresco.service.namespace.QName;
/**
* A simple 1-1 property mapping from a CMIS property name to an alfresco
* property
* A simple 1-1 property mapping from a CMIS property name to an alfresco property
*
* @author florian.mueller
*/
@@ -37,10 +36,6 @@ public class DirectProperty extends AbstractProperty
/**
* Construct
*
* @param serviceRegistry
* @param propertyName
* @param alfrescoName
*/
public DirectProperty(ServiceRegistry serviceRegistry, CMISConnector connector, String propertyName,
QName alfrescoName)
@@ -56,12 +51,20 @@ public class DirectProperty extends AbstractProperty
public Serializable getValueInternal(CMISNodeInfo nodeInfo)
{
if (nodeInfo.getType() == null)
{
// Invalid node
return null;
}
if (nodeInfo.getNodeRef() != null)
{
return getServiceRegistry().getNodeService().getProperty(nodeInfo.getNodeRef(), alfrescoName);
} else if (nodeInfo.getAssociationRef() != null)
}
else if (nodeInfo.getAssociationRef() != null)
{
return getServiceRegistry().getNodeService().getProperty(nodeInfo.getAssociationRef().getSourceRef(),
return getServiceRegistry().getNodeService().getProperty(
nodeInfo.getAssociationRef().getSourceRef(),
alfrescoName);
}