From d8b5f09911ad5e66720a4484cba62a8bdd0f0704 Mon Sep 17 00:00:00 2001
From: Derek Hulley <derek.hulley@alfresco.com>
Date: Tue, 20 Sep 2011 12:47:34 +0000
Subject: [PATCH] ALF-10271: Test disabled:
 ArchiveAndRestoreTest.testAR7889ArchiveAndRestoreMustNotModifyAuditable  -
 Added required checks for behaviour activation

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@30640 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 .../alfresco/repo/node/archive/ArchiveAndRestoreTest.java  | 2 +-
 .../java/org/alfresco/repo/node/db/DbNodeServiceImpl.java  | 7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/source/java/org/alfresco/repo/node/archive/ArchiveAndRestoreTest.java b/source/java/org/alfresco/repo/node/archive/ArchiveAndRestoreTest.java
index 4860b114b6..8741409edd 100644
--- a/source/java/org/alfresco/repo/node/archive/ArchiveAndRestoreTest.java
+++ b/source/java/org/alfresco/repo/node/archive/ArchiveAndRestoreTest.java
@@ -761,7 +761,7 @@ public class ArchiveAndRestoreTest extends TestCase
     /**
      * <a href="https://issues.alfresco.com/jira/browse/ALF-7889">ALF-7889</a>
      */
-    public synchronized void DISABLED_testAR7889ArchiveAndRestoreMustNotModifyAuditable() throws Exception
+    public synchronized void testAR7889ArchiveAndRestoreMustNotModifyAuditable() throws Exception
     {
         AuthenticationUtil.setFullyAuthenticatedUser(USER_A);
         nodeService.addAspect(b, ContentModel.ASPECT_AUDITABLE, null);
diff --git a/source/java/org/alfresco/repo/node/db/DbNodeServiceImpl.java b/source/java/org/alfresco/repo/node/db/DbNodeServiceImpl.java
index d553f0c2de..27f130a545 100644
--- a/source/java/org/alfresco/repo/node/db/DbNodeServiceImpl.java
+++ b/source/java/org/alfresco/repo/node/db/DbNodeServiceImpl.java
@@ -2543,6 +2543,13 @@ public class DbNodeServiceImpl extends AbstractNodeServiceImpl
         }
         // The dictionary says propagate.  Now get the parent node and prompt the touch.
         NodeRef parentNodeRef = assocRef.getParentRef();
+        
+        // Do not propagate if the cm:auditable behaviour is off
+        if (!policyBehaviourFilter.isEnabled(parentNodeRef, ContentModel.ASPECT_AUDITABLE))
+        {
+            return;
+        }
+        
         Pair<Long, NodeRef> parentNodePair = getNodePairNotNull(parentNodeRef);
         Long parentNodeId = parentNodePair.getFirst();
         // If we have already modified a particular parent node in the current txn,