From cc7787be0836aeaf542be851ecdf71981814b192 Mon Sep 17 00:00:00 2001 From: Alan Davis Date: Mon, 5 Dec 2011 14:26:16 +0000 Subject: [PATCH] ALF-11843: Merge V3.4-BUG-FIX (3.4.8) to HEAD (4.0) 32527: ALF-11495: Merge V3.4.1 (3.4.1.23) to V3.4-BUG-FIX (3.4.8) 32494: ALF-11381 Enterprise unlimited licenses still get invalidated turning the system into read-only mode Additional logging on TrueLicense Catch GenericCertificateIntegrityException in LicenseComponent git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@32536 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 90bd291f85..ab0a7feb95 100644 --- a/source/java/org/alfresco/repo/descriptor/RepositoryDescriptorDAOImpl.java +++ b/source/java/org/alfresco/repo/descriptor/RepositoryDescriptorDAOImpl.java @@ -302,7 +302,7 @@ public class RepositoryDescriptorDAOImpl implements DescriptorDAO if (logger.isDebugEnabled()) { // reader should never be null. An exception is thrown by getReader if it is. - logger.debug("getLicenseKey: reader=" + reader + (reader == null ? "" : " exists=" + exists)); + logger.debug("getLicenseKey: reader " + (reader == null ? "is null" : " file does "+(exists ? "" : "NOT ") + "exist")); } } }