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

@@ -79,7 +79,7 @@ import org.springframework.extensions.surf.util.AbstractLifecycleBean;
* The home folders for internal users (such as {@code admin} and {@code
* guest}) that use {@code guestHomeFolderProvider} or {@code
* bootstrapHomeFolderProvider} are not moved, nor are any users that use
* {@link HomeFolderProviders} create shared home folders (all user are
* HomeFolderProviders create shared home folders (all user are
* given the same home folder).
*
* It is also possible change the HomeFolderProvider used by all other
@@ -456,14 +456,14 @@ public class HomeFolderProviderSynchronizer extends AbstractLifecycleBean
}.doWork();
}
/**
* Creates the new home folder structure, before we move home folders so that
* we don't have race conditions that result in unnecessary retries.
* @param person person nodeRef
* @param overrideProviderName override provider name
*/
private void createParentFolders(NodeRef person, String overrideProviderName)
{
/**
* Creates the new home folder structure, before we move home folders so that
* we don't have race conditions that result in unnecessary retries.
* @param person person nodeRef
* @param overrideProviderName override provider name
*/
private void createParentFolders(NodeRef person, String overrideProviderName)
{
// We could short cut this process and build all the home folder from the
// ParentFolderStructure in the calling method, but that would complicate
// the code a little more and might result in transaction size problems.