From dc3d804dfe5823664809dc84d31fb0b512a43b80 Mon Sep 17 00:00:00 2001 From: Alan Davis Date: Wed, 12 Feb 2014 08:10:30 +0000 Subject: [PATCH] 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 --- .../alfresco/repo/descriptor/RepositoryDescriptorDAOImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/java/org/alfresco/repo/descriptor/RepositoryDescriptorDAOImpl.java b/source/java/org/alfresco/repo/descriptor/RepositoryDescriptorDAOImpl.java index ab0a7feb95..1c536eaffb 100644 --- a/source/java/org/alfresco/repo/descriptor/RepositoryDescriptorDAOImpl.java +++ b/source/java/org/alfresco/repo/descriptor/RepositoryDescriptorDAOImpl.java @@ -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);