From 7b0bd9b5dd5b8a56e7751e637985c195df0bc672 Mon Sep 17 00:00:00 2001 From: Alan Davis Date: Tue, 11 Feb 2014 19:02:36 +0000 Subject: [PATCH] Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud) 57054: Merged V4.2-BUG-FIX (4.2.1) to HEAD-BUG-FIX (Cloud/4.3) 56522: Merged HEAD-BUG-FIX to V4.2-BUG-FIX (4.2.1) 56431: (MNT-9755) ALF-20071 -NodeMonitor onUpdateProperties method can be optimized git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@61688 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- source/java/org/alfresco/filesys/repo/NodeMonitor.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/source/java/org/alfresco/filesys/repo/NodeMonitor.java b/source/java/org/alfresco/filesys/repo/NodeMonitor.java index e84b183fbc..fd03c0b9a8 100644 --- a/source/java/org/alfresco/filesys/repo/NodeMonitor.java +++ b/source/java/org/alfresco/filesys/repo/NodeMonitor.java @@ -279,12 +279,12 @@ public class NodeMonitor extends TransactionListenerAdapter String beforeName = (String) before.get(ContentModel.PROP_NAME); String afterName = (String) after.get(ContentModel.PROP_NAME); - Path nodePath = m_nodeService.getPath(nodeRef); - String relPath = nodePath.toDisplayPath(m_nodeService, m_permissionService); - if (( beforeLock != null && afterLock == null) || ( beforeLock == null && afterLock != null)) { + Path nodePath = m_nodeService.getPath(nodeRef); + String relPath = nodePath.toDisplayPath(m_nodeService, m_permissionService); + // Process the lock update first fireNodeEvent(new LockNodeEvent( fType, nodeRef, relPath, beforeName, beforeLock, afterLock)); }