Merge release/V2.4.0.x into merge/MNT-17512_AuditManagePermissions.

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.
      *

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;
     }
 
     /**

rm-community/rm-community-repo/source/java/org/alfresco/repo/security/permissions/impl/ExtendedPermissionServiceImpl.java

@@ -248,7 +248,7 @@ public class ExtendedPermissionServiceImpl extends PermissionServiceImpl
         {
         	// post process permission
         	result = postProcessor.process(result, nodeRef, perm, this.configuredReadPermissions, this.configuredFilePermissions);
-		}
+        }
 
         return result;
     }