From 6e002e6de82e5984154364bf45c0876278bda702 Mon Sep 17 00:00:00 2001 From: Jan Vonka Date: Thu, 6 Sep 2007 17:23:23 +0000 Subject: [PATCH] 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 --- .../java/org/alfresco/repo/node/db/DbNodeServiceImpl.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/source/java/org/alfresco/repo/node/db/DbNodeServiceImpl.java b/source/java/org/alfresco/repo/node/db/DbNodeServiceImpl.java index 59d344c35a..05e7cab3f7 100644 --- a/source/java/org/alfresco/repo/node/db/DbNodeServiceImpl.java +++ b/source/java/org/alfresco/repo/node/db/DbNodeServiceImpl.java @@ -988,7 +988,8 @@ public class DbNodeServiceImpl extends AbstractNodeServiceImpl // get the property definition 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()); } @@ -1040,7 +1041,8 @@ public class DbNodeServiceImpl extends AbstractNodeServiceImpl // get the property definition 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()); }