Merged 5.0.N (5.0.3) to HEAD (5.1) (PARTIAL MERGE)

110090: Merged 5.0.2 (5.0.2) to 5.0.N (5.0.3)
      110075: Fix to cover MNT-14463 and MNT-14546
       - RM now works
       - The basic dictionary (classpath xml files) are loaded in the first phase as before,
         however, after the listeners have been registered, we now force an immediate, on-thread
         refresh in order to get the full model list from the repo immediately while still
         having the basic dictionary available for subsystems
       - Cleanup of code in DictionaryDAOImpl
       - Javadoc to make things clearer


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@110215 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Tatyana Valkevych
2015-08-17 11:48:04 +00:00
parent e11febd09e
commit 17d4505ed3

View File

@@ -631,8 +631,8 @@ implements TenantDeployer, DictionaryListener, /*TenantDictionaryListener, */Mes
// Register listeners, which will be called when the dictionary is next reloaded
register();
// Trigger a reload.
// The callbacks, which will occur asynchronously, will load the custom models from the repository.
// Trigger a reload. The callbacks will occur immediately on the current thread, however,
// the model created in reset() will still be available for the basic necessities
dictionaryDAO.init();
// The listeners can now know about this