From 5c6dabfff34bbf633c7ea47641c14a8d77bcabc2 Mon Sep 17 00:00:00 2001
From: Mark Rogers <mark.rogers@alfresco.com>
Date: Wed, 30 Apr 2014 16:33:27 +0000
Subject: [PATCH] Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)    68202:
 Merged PLATFORM1 (4.3/Cloud) to HEAD-BUG-FIX (4.3/Cloud)       65477: 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@68465 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 .../descriptor/DescriptorServiceImpl.java     | 61 ++++++++++---------
 1 file changed, 31 insertions(+), 30 deletions(-)

diff --git a/source/java/org/alfresco/repo/descriptor/DescriptorServiceImpl.java b/source/java/org/alfresco/repo/descriptor/DescriptorServiceImpl.java
index 34453d6266..5475776006 100644
--- a/source/java/org/alfresco/repo/descriptor/DescriptorServiceImpl.java
+++ b/source/java/org/alfresco/repo/descriptor/DescriptorServiceImpl.java
@@ -300,34 +300,15 @@ public class DescriptorServiceImpl extends AbstractLifecycleBean
         // Now listen for future license changes
         licenseService.registerOnLicenseChange(this);
         
-        // load the license
-        RetryingTransactionCallback<Void> loadLicenseCallback = new RetryingTransactionCallback<Void>()
-        {
-            @Override
-            public Void execute() throws Throwable
-            {
-                // Verify license has side effect of loading any new licenses
-                licenseService.verifyLicense();
-                return null;
-            }
-        };
         try
-        {
-            helper.doInTransaction(loadLicenseCallback, false, false);
+        {   
+            // Verify license has side effect of loading any new licenses
+            licenseService.verifyLicense();
         }
-        catch (Exception e)
+        catch (LicenseException e)
         {
             // Swallow Licence Exception Here
-            if (ExceptionStackUtil.getCause(e, LicenseException.class) != null)
-            {
-                // We found a LicenseException in the bowels
-                // Don't log error: It'll be reported by other means
-            }
-            else
-            {
-                // The error here is something else unforeseen
-                throw e;
-            }
+            // Don't log error: It'll be reported by other means
         };
     }
 
@@ -405,7 +386,19 @@ public class DescriptorServiceImpl extends AbstractLifecycleBean
             {
                 if (currentRepoDescriptor == null)
                 {
-                    currentRepoDescriptor = currentRepoDescriptorDAO.updateDescriptor(serverDescriptor, LicenseMode.UNKNOWN);
+                	final RetryingTransactionHelper txnHelper = transactionService.getRetryingTransactionHelper();
+                	
+                	RetryingTransactionCallback<Void> nopLoadLicense = new RetryingTransactionCallback<Void>()
+                	{
+						@Override
+						public Void execute() 
+						{
+		                    currentRepoDescriptor = currentRepoDescriptorDAO.updateDescriptor(serverDescriptor, LicenseMode.UNKNOWN);
+		                    return null;
+						}
+                	};
+                	            
+                 	txnHelper.doInTransaction(nopLoadLicense, false, false);
                 }
             }
         }
@@ -736,8 +729,6 @@ public class DescriptorServiceImpl extends AbstractLifecycleBean
             };
             RetryingTransactionHelper txnHelper = transactionService.getRetryingTransactionHelper();
             txnHelper.setForceWritable(true);
-            // ALF-19629 - Need to sort out trnsaction retry and do we need to Job Lock?
-            //txnHelper.doInTransaction(updateLicenseCallback, false, true);
             txnHelper.doInTransaction(updateLicenseCallback);
         }
     }
@@ -756,9 +747,19 @@ public class DescriptorServiceImpl extends AbstractLifecycleBean
             // Make sure that the repo descriptor is updated the first time
             if (currentRepoDescriptor == null)
             {
-                currentRepoDescriptor = currentRepoDescriptorDAO.updateDescriptor(
-                        serverDescriptor,
-                        LicenseMode.UNKNOWN);
+               	final RetryingTransactionHelper txnHelper = transactionService.getRetryingTransactionHelper();
+            	RetryingTransactionCallback<Void> nopLoadLicense = new RetryingTransactionCallback<Void>()
+                {
+            		@Override
+            		public Void execute() 
+            		{
+                         currentRepoDescriptor = currentRepoDescriptorDAO.updateDescriptor(serverDescriptor, LicenseMode.UNKNOWN);
+                         return null;
+            		}
+                };
+                txnHelper.setForceWritable(true);        
+                txnHelper.doInTransaction(nopLoadLicense, false, false);
+
             }
         }
     }