diff --git a/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/rm-ui-evaluators-context.xml b/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/rm-ui-evaluators-context.xml
index 3d8ea5c7e4..daccb826a1 100644
--- a/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/rm-ui-evaluators-context.xml
+++ b/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/rm-ui-evaluators-context.xml
@@ -38,6 +38,7 @@
+
results = transactionalResourceHelper.getMap("BaseEvaluator.evaluate");
+
+ if (!results.containsKey(nodeRef))
{
- result = evaluateImpl(nodeRef);
+ boolean result = false;
+
+ // Check that we are dealing with the correct kind of RM object
+ if ((kinds == null || checkKinds(nodeRef)) &&
+ // Check we have the required capabilities
+ (capabilities == null || checkCapabilities(nodeRef)))
+ {
+ result = evaluateImpl(nodeRef);
+ }
+
+ results.put(nodeRef, result);
}
- return result;
+ return results.get(nodeRef);
}
/**