From 13d396566319fe2b62ca1bf2a6c729d5c09c23f1 Mon Sep 17 00:00:00 2001
From: Mark Rogers <mark.rogers@alfresco.com>
Date: Wed, 30 Apr 2014 16:32:27 +0000
Subject: [PATCH] Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)    68199:
 Merged PLATFORM1 (4.3/Cloud) to HEAD-BUG-FIX (4.3/Cloud)       63894: ACE-525
 - 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@68462 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 .../descriptor/DescriptorServiceImpl.java     | 26 ++++++-------------
 .../repo/descriptor/DescriptorStartupLog.java |  5 ++--
 2 files changed, 11 insertions(+), 20 deletions(-)

diff --git a/source/java/org/alfresco/repo/descriptor/DescriptorServiceImpl.java b/source/java/org/alfresco/repo/descriptor/DescriptorServiceImpl.java
index 0237e8280b..4d5f1d27d8 100644
--- a/source/java/org/alfresco/repo/descriptor/DescriptorServiceImpl.java
+++ b/source/java/org/alfresco/repo/descriptor/DescriptorServiceImpl.java
@@ -299,26 +299,16 @@ public class DescriptorServiceImpl extends AbstractLifecycleBean
         // Now listen for future license changes
         licenseService.registerOnLicenseChange(this);
         
-        // load the license
-        RetryingTransactionCallback<Void> loadLicenseCallback = new RetryingTransactionCallback<Void>()
+        try
+        {   
+            // Verify license has side effect of loading any new licenses
+            licenseService.verifyLicense();
+        }
+        catch (LicenseException e)
         {
-            public Void execute() 
-            {
-                try
-                {   
-                    // Verify license has side effect of loading any new licenses
-                    licenseService.verifyLicense();
-                    return null;
-                }
-                catch (LicenseException e)
-                {
-                    // Swallow Licence Exception Here
-                    // Don't log error: It'll be reported later and the logging fails
-                    return null;
-                }
-            }
+            // Swallow Licence Exception Here
+            // Don't log error: It'll be reported by other means
         };
-        helper.doInTransaction(loadLicenseCallback, false, false);
     }
 
     @Override
diff --git a/source/java/org/alfresco/repo/descriptor/DescriptorStartupLog.java b/source/java/org/alfresco/repo/descriptor/DescriptorStartupLog.java
index c5d07e6a55..dd2be32c8c 100644
--- a/source/java/org/alfresco/repo/descriptor/DescriptorStartupLog.java
+++ b/source/java/org/alfresco/repo/descriptor/DescriptorStartupLog.java
@@ -149,7 +149,8 @@ public class DescriptorStartupLog extends AbstractLifecycleBean
         }
         
         // Log Repository Descriptors
-        if (logger.isInfoEnabled())
+        // MER - work around for currentRepositoryDescriptor == null
+        if (logger.isInfoEnabled() && descriptorService.getCurrentRepositoryDescriptor() != null)
         {
             Descriptor serverDescriptor = descriptorService.getServerDescriptor();
             Descriptor currentDescriptor = descriptorService.getCurrentRepositoryDescriptor();
@@ -176,7 +177,7 @@ public class DescriptorStartupLog extends AbstractLifecycleBean
         }
         
         // Issue a warning if the system is in read-only mode
-        if (!transactionService.getAllowWrite())
+        if (logger.isWarnEnabled() && !transactionService.getAllowWrite())
         {
             logger.warn(I18NUtil.getMessage(SYSTEM_WARN_READONLY));
         }