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 4c30e52dc3
commit 7dd2291753
784 changed files with 5454 additions and 5487 deletions

View File

@@ -499,7 +499,7 @@ public class RepoTransferReceiverImpl implements TransferReceiver,
}
/**
* @return
* @return NodeRef
*/
private NodeRef createTransferRecord()
{
@@ -558,7 +558,7 @@ public class RepoTransferReceiverImpl implements TransferReceiver,
*
* This is the last chance to clean up.
*
* @param transferId
* @param transferId String
*/
private void timeout(final String transferId)
{
@@ -722,7 +722,7 @@ public class RepoTransferReceiverImpl implements TransferReceiver,
}
/**
* @param file
* @param file File
*/
private void deleteFile(File file)
{