From dc140df4edc15229a99041cb535c280b8d35f297 Mon Sep 17 00:00:00 2001 From: Roy Wetherall Date: Tue, 31 Jan 2006 15:36:33 +0000 Subject: [PATCH] - Extended some web service content tests - Fixed issue with version author being displayed incorrectly - Fixed hasCategoryValue evalautor null pointer error found during testing git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2262 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../repo/action/evaluator/InCategoryEvaluator.java | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/source/java/org/alfresco/repo/action/evaluator/InCategoryEvaluator.java b/source/java/org/alfresco/repo/action/evaluator/InCategoryEvaluator.java index 010b87e820..3d0761b948 100644 --- a/source/java/org/alfresco/repo/action/evaluator/InCategoryEvaluator.java +++ b/source/java/org/alfresco/repo/action/evaluator/InCategoryEvaluator.java @@ -125,13 +125,16 @@ public class InCategoryEvaluator extends ActionConditionEvaluatorAbstractBase { // Check to see if the category value is in the list of currently set category values Serializable value = this.nodeService.getProperty(actionedUponNodeRef, categoryProperty); - Collection actualCategories = DefaultTypeConverter.INSTANCE.getCollection(NodeRef.class, value); - for (NodeRef nodeRef : actualCategories) + if (value != null) { - if (nodeRef.equals(categoryValue) == true) + Collection actualCategories = DefaultTypeConverter.INSTANCE.getCollection(NodeRef.class, value); + for (NodeRef nodeRef : actualCategories) { - result = true; - break; + if (nodeRef != null && nodeRef.equals(categoryValue) == true) + { + result = true; + break; + } } } }