From e579b15f1587d571e972806543bfd881a4a80c19 Mon Sep 17 00:00:00 2001
From: Matt Ward <matt.ward@alfresco.com>
Date: Wed, 22 Feb 2012 18:06:59 +0000
Subject: [PATCH] ALF-12866: WebDAV should use in-memory locking for transient
 locks

Added a couple of comments and removed a redundant method parameter.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@34175 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 .../org/alfresco/repo/webdav/WebDAVMethod.java  | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/source/java/org/alfresco/repo/webdav/WebDAVMethod.java b/source/java/org/alfresco/repo/webdav/WebDAVMethod.java
index 412ff46ba1..6d876d79e9 100644
--- a/source/java/org/alfresco/repo/webdav/WebDAVMethod.java
+++ b/source/java/org/alfresco/repo/webdav/WebDAVMethod.java
@@ -1145,7 +1145,7 @@ public abstract class WebDAVMethod
             {
                 try
                 {
-                    lockInfo = getNodeLockInfoIndirect(nodeInfo, parent);
+                    lockInfo = getNodeLockInfoIndirect(parent);
                     if (lockInfo != null)
                     {
                         return lockInfo;
@@ -1166,6 +1166,13 @@ public abstract class WebDAVMethod
         }
     }
     
+    /**
+     * Checks if a node is directly locked. A direct lock is one associated with the node itself
+     * rather than associated with some ancestor.
+     * 
+     * @param nodeInfo
+     * @return The LockInfo if the node is <strong>locked</strong>, or null otherwise.
+     */
     private LockInfo getNodeLockInfoDirect(FileInfo nodeInfo)
     {
         LockInfo lock = getLockStore().get(nodeInfo.getNodeRef());
@@ -1178,7 +1185,13 @@ public abstract class WebDAVMethod
         return null;
     }
     
-    private LockInfo getNodeLockInfoIndirect(FileInfo nodeInfo, NodeRef parent)
+    /**
+     * Checks whether a parent node has a lock that is valid for all its descendants.
+     * 
+     * @param parent
+     * @return The LockInfo if the node is <strong>locked</strong>, or null otherwise.
+     */
+    private LockInfo getNodeLockInfoIndirect(NodeRef parent)
     {
         LockInfo parentLock = getLockStore().get(parent);