From f8eb3f7f62f477052aafc644cdf34bb18813bd07 Mon Sep 17 00:00:00 2001
From: Will Abson <will.abson@alfresco.com>
Date: Wed, 25 Jun 2014 16:07:13 +0000
Subject: [PATCH] Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (4.3/Cloud)    73687:
 Merged V4.2-BUG-FIX (4.2.3) to HEAD-BUG-FIX (4.3/Cloud)       73547: Merged
 DEV to V4.2-BUG-FIX (4.2.3)          69607: MNT-11072 : Auditing not logging
 when system is on read only mode          Additional fixes are required for
 AuditMethodInterceptor and AuditComponentImpl to write audit on read-only
 server.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@74802 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 .../java/org/alfresco/repo/audit/AuditComponentImpl.java   | 7 +------
 .../org/alfresco/repo/audit/AuditMethodInterceptor.java    | 6 ------
 2 files changed, 1 insertion(+), 12 deletions(-)

diff --git a/source/java/org/alfresco/repo/audit/AuditComponentImpl.java b/source/java/org/alfresco/repo/audit/AuditComponentImpl.java
index 55a80708c4..791ac068a2 100644
--- a/source/java/org/alfresco/repo/audit/AuditComponentImpl.java
+++ b/source/java/org/alfresco/repo/audit/AuditComponentImpl.java
@@ -259,14 +259,9 @@ public class AuditComponentImpl implements AuditComponent
     @Override
     public boolean areAuditValuesRequired(String path)
     {
-        if (loggerInbound.isDebugEnabled())
-        {
-            return !transactionService.isReadOnly();
-        }
         PathMapper pathMapper = auditModelRegistry.getAuditPathMapper();
         Set<String> mappedPaths = pathMapper.getMappedPathsWithPartialMatch(path);
-        // for performance, fall through if no mapped paths so isReadyOnly is never called
-        return (mappedPaths.size() > 0 && !transactionService.isReadOnly());
+        return mappedPaths.size() > 0;
     }
 
     /**
diff --git a/source/java/org/alfresco/repo/audit/AuditMethodInterceptor.java b/source/java/org/alfresco/repo/audit/AuditMethodInterceptor.java
index 3d9213c92a..1d71005f1c 100644
--- a/source/java/org/alfresco/repo/audit/AuditMethodInterceptor.java
+++ b/source/java/org/alfresco/repo/audit/AuditMethodInterceptor.java
@@ -152,15 +152,9 @@ public class AuditMethodInterceptor implements MethodInterceptor
     
     public Object invoke(MethodInvocation mi) throws Throwable
     {
-        // Bypass all auditing if the system is in read-only mode
-        if (!transactionService.getAllowWrite())
-        {
-            return mi.proceed();
-        }
         // Shortcut if no audit values are required
         if(!auditComponent.areAuditValuesRequired(AUDIT_PATH_API_ROOT))
         {
-            // No auditing or server is read-only
             return mi.proceed();
         }
         else