From ac65ee775873e609177975e2376a4dc2c06f3ce6 Mon Sep 17 00:00:00 2001
From: Tom Page <tom.page@alfresco.com>
Date: Fri, 24 Feb 2017 08:05:11 +0000
Subject: [PATCH] MNT-17512 Minor fixes after review.

Add new service method to security bean. Add early exit from audit event
finding loop. Tidy javadoc and remove some blank lines.
---
 .../module/org_alfresco_module_rm/rm-service-context.xml    | 1 +
 .../audit/RecordsManagementAuditService.java                | 3 ---
 .../audit/RecordsManagementAuditServiceImpl.java            | 6 ++----
 .../permissions/impl/ExtendedPermissionServiceImpl.java     | 2 +-
 4 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/rm-service-context.xml b/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/rm-service-context.xml
index b4dd973238..a39e06c4f0 100644
--- a/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/rm-service-context.xml
+++ b/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/rm-service-context.xml
@@ -970,6 +970,7 @@
                 <![CDATA[
                 org.alfresco.module.org_alfresco_module_rm.audit.RecordsManagementAuditService.registerAuditEvent=RM_ALLOW
                 org.alfresco.module.org_alfresco_module_rm.audit.RecordsManagementAuditService.auditEvent=RM_ALLOW
+                org.alfresco.module.org_alfresco_module_rm.audit.RecordsManagementAuditService.auditOrUpdateEvent=RM_ALLOW
                 org.alfresco.module.org_alfresco_module_rm.audit.RecordsManagementAuditService.clearAuditLog=RM_CAP.0.rma:filePlanComponent.DeleteAudit
                 org.alfresco.module.org_alfresco_module_rm.audit.RecordsManagementAuditService.getAuditTrail=RM_ALLOW
                 org.alfresco.module.org_alfresco_module_rm.audit.RecordsManagementAuditService.getAuditTrailFile=RM_ALLOW
diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/audit/RecordsManagementAuditService.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/audit/RecordsManagementAuditService.java
index 77eada74f6..8d09090097 100644
--- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/audit/RecordsManagementAuditService.java
+++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/audit/RecordsManagementAuditService.java
@@ -46,8 +46,6 @@ public interface RecordsManagementAuditService extends RecordsManagementAuditSer
 {
     public enum ReportFormat { HTML, JSON }
 
-
-
     /**
      * Retrieves a list of audit events.
      *
@@ -165,7 +163,6 @@ public interface RecordsManagementAuditService extends RecordsManagementAuditSer
      */
     void stopAuditLog(NodeRef filePlan);
 
-
     /**
      * Clears the RM audit.
      *
diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/audit/RecordsManagementAuditServiceImpl.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/audit/RecordsManagementAuditServiceImpl.java
index 977bbc73ac..d7041ea2d9 100644
--- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/audit/RecordsManagementAuditServiceImpl.java
+++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/audit/RecordsManagementAuditServiceImpl.java
@@ -577,22 +577,20 @@ public class RecordsManagementAuditServiceImpl extends AbstractLifecycleBean
      *
      * @param nodeRef The node the event is against.
      * @param eventName The name of the event.
-     * @param auditDetails The complete set of events for the transaction.
      * @return The pre-existing event node, or null if none exists.
      */
     private RMAuditNode findExistingEventNode(NodeRef nodeRef, String eventName)
     {
         AlfrescoTransactionSupport.bindListener(txnListener);
         Set<RMAuditNode> auditDetails = TransactionalResourceHelper.getSet(KEY_RM_AUDIT_NODE_RECORDS);
-        RMAuditNode existingEventNode = null;
         for (RMAuditNode existingRMAuditNode : auditDetails)
         {
             if (existingRMAuditNode.getNodeRef().equals(nodeRef) && existingRMAuditNode.getEventName().equals(eventName))
             {
-                existingEventNode = existingRMAuditNode;
+                return existingRMAuditNode;
             }
         }
-        return existingEventNode;
+        return null;
     }
 
     /**
diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/repo/security/permissions/impl/ExtendedPermissionServiceImpl.java b/rm-community/rm-community-repo/source/java/org/alfresco/repo/security/permissions/impl/ExtendedPermissionServiceImpl.java
index fd87bd94b9..9ac005bf74 100644
--- a/rm-community/rm-community-repo/source/java/org/alfresco/repo/security/permissions/impl/ExtendedPermissionServiceImpl.java
+++ b/rm-community/rm-community-repo/source/java/org/alfresco/repo/security/permissions/impl/ExtendedPermissionServiceImpl.java
@@ -209,7 +209,7 @@ public class ExtendedPermissionServiceImpl extends PermissionServiceImpl
         {
         	// post process permission
         	result = postProcessor.process(result, nodeRef, perm);
-		}
+        }
 
         return result;
     }