diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/action/AuditableActionExecuterAbstractBase.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/action/AuditableActionExecuterAbstractBase.java index 116fb945fb..e3255f3908 100755 --- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/action/AuditableActionExecuterAbstractBase.java +++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/action/AuditableActionExecuterAbstractBase.java @@ -64,7 +64,10 @@ public abstract class AuditableActionExecuterAbstractBase extends ActionExecuter @Override public void init() { - super.init(); + if (this instanceof RecordsManagementAction == false) + { + super.init(); + } if (auditable == true) { diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/action/RecordsManagementAction.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/action/RecordsManagementAction.java index d653c3bfa2..3075140f6a 100644 --- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/action/RecordsManagementAction.java +++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/action/RecordsManagementAction.java @@ -76,6 +76,7 @@ public interface RecordsManagementAction public NodeRef getImplicitTargetNodeRef(); /** + * Get the records management action definition. * * @return * @since 2.1 @@ -83,6 +84,7 @@ public interface RecordsManagementAction public RecordsManagementActionDefinition getRecordsManagementActionDefinition(); /** + * Indicates whether the action is public or not * * @return * @since 2.1 diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/RMActionProxyFactoryBean.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/RMActionProxyFactoryBean.java index 3a7d74103d..aceef79fde 100644 --- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/RMActionProxyFactoryBean.java +++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/RMActionProxyFactoryBean.java @@ -82,10 +82,8 @@ public class RMActionProxyFactoryBean extends ProxyFactoryBean { public Void doWork() throws Exception { - RecordsManagementAction action = (RecordsManagementAction)getObject(); - + RecordsManagementAction action = (RecordsManagementAction)getObject(); recordsManagementActionService.register(action); - // recordsManagementAuditService.registerActionAuditEvent(action); return null; }