Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)

107541: Merged 5.0.N (5.0.3) to HEAD-BUG-FIX (5.1/Cloud) (PARTIAL MERGE)
      107413: Merged DEV to 5.0.N (5.0.3)
         106858 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Cleaning of Javadoc,
   107565: MNT-13545 Fix compilation after merge of Javadoc


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@107633 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Tatyana Valkevych
2015-07-02 16:13:03 +00:00
parent a5f8df310a
commit 22d2935235
119 changed files with 444 additions and 434 deletions

View File

@@ -956,7 +956,7 @@ public class PropFindMethod extends WebDAVMethod
/**
* Loads all dead properties persisted on the node
*
* @param nodeRef
* @param nodeRef NodeRef
* @return the map of all dead properties
*/
@SuppressWarnings("unchecked")
@@ -1022,8 +1022,7 @@ public class PropFindMethod extends WebDAVMethod
/**
* Output the lockentry element of the specified type
* @param xml XMLWriter
* @param lockType lock type. Can be WebDAV.XML_NS_EXCLUSIVE or WebDAV.XML_NS_SHARED
* @param lockType lock type containing namespace
* @param lockType lock type containing namespace. Can be WebDAV.XML_NS_EXCLUSIVE or WebDAV.XML_NS_SHARED
* @throws SAXException
* @throws IOException
*/