mirror of
https://github.com/Alfresco/alfresco-community-repo.git
synced 2025-07-24 17:32:48 +00:00
Build fix for unit test: ActionServiceImplTest.testActionResult (follow-on for r6686)
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@6695 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
@@ -988,7 +988,8 @@ public class DbNodeServiceImpl extends AbstractNodeServiceImpl
|
|||||||
// get the property definition
|
// get the property definition
|
||||||
PropertyDefinition propertyDef = dictionaryService.getProperty(propertyQName);
|
PropertyDefinition propertyDef = dictionaryService.getProperty(propertyQName);
|
||||||
|
|
||||||
if ((propertyDef != null) && (propertyDef.getDataType().getName().equals(DataTypeDefinition.NODE_REF)) && (propertyValue.getStringValue() != null))
|
if ((propertyDef != null) && (propertyDef.getDataType().getName().equals(DataTypeDefinition.NODE_REF)) &&
|
||||||
|
(propertyValue != null) && (propertyValue.getStringValue() != null))
|
||||||
{
|
{
|
||||||
propertyValue.setStringValue(tenantService.getBaseName(new NodeRef(propertyValue.getStringValue())).toString());
|
propertyValue.setStringValue(tenantService.getBaseName(new NodeRef(propertyValue.getStringValue())).toString());
|
||||||
}
|
}
|
||||||
@@ -1040,7 +1041,8 @@ public class DbNodeServiceImpl extends AbstractNodeServiceImpl
|
|||||||
// get the property definition
|
// get the property definition
|
||||||
PropertyDefinition propertyDef = dictionaryService.getProperty(qname);
|
PropertyDefinition propertyDef = dictionaryService.getProperty(qname);
|
||||||
|
|
||||||
if ((propertyDef != null) && (propertyDef.getDataType().getName().equals(DataTypeDefinition.NODE_REF)) && (propertyValue.getStringValue() != null))
|
if ((propertyDef != null) && (propertyDef.getDataType().getName().equals(DataTypeDefinition.NODE_REF)) &&
|
||||||
|
(propertyValue != null) && (propertyValue.getStringValue() != null))
|
||||||
{
|
{
|
||||||
propertyValue.setStringValue(tenantService.getBaseName(new NodeRef(propertyValue.getStringValue())).toString());
|
propertyValue.setStringValue(tenantService.getBaseName(new NodeRef(propertyValue.getStringValue())).toString());
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user