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

59880: Merged V4.2-BUG-FIX (4.2.2) to HEAD-BUG-FIX (Cloud/4.3)
      59604: Merged DEV to V4.2-BUG-FIX
         58029: Fix LicenseComponent to use a transaction when fetching descriptors from the repo (MNT-9806)
                - Possible relation to ALF-19629: BM-0013: SOAK: v420b214_01: DescriptorService intercepts retrying exception during concurrent start


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62196 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alan Davis
2014-02-12 08:10:30 +00:00
parent 4119889331
commit dc3d804dfe

View File

@@ -201,7 +201,7 @@ public class RepositoryDescriptorDAOImpl implements DescriptorDAO
props.put(ContentModel.PROP_SYS_VERSION_LABEL, serverDescriptor.getVersionLabel());
props.put(ContentModel.PROP_SYS_VERSION_BUILD, serverDescriptor.getVersionBuild());
props.put(ContentModel.PROP_SYS_VERSION_SCHEMA, serverDescriptor.getSchema());
props.put(ContentModel.PROP_SYS_LICENSE_MODE, licenseMode);
props.put(ContentModel.PROP_SYS_LICENSE_MODE, licenseMode);
this.nodeService.addProperties(currentDescriptorNodeRef, props);