inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-07 17:49:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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
This commit is contained in:
Mark Rogers
2014-04-30 16:32:27 +00:00
parent acc78eeccb
commit 13d3965663
2 changed files with 11 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
source/java/org/alfresco/repo/descriptor/DescriptorServiceImpl.java
View File

@@ -299,26 +299,16 @@ public class DescriptorServiceImpl extends AbstractLifecycleBean
// Now listen for future license changes // Now listen for future license changes
licenseService.registerOnLicenseChange(this); licenseService.registerOnLicenseChange(this);
// load the license try
RetryingTransactionCallback<Void> loadLicenseCallback = new RetryingTransactionCallback<Void>() {
// Verify license has side effect of loading any new licenses
licenseService.verifyLicense();
}
catch (LicenseException e)
{ {
public Void execute() // Swallow Licence Exception Here
{ // Don't log error: It'll be reported by other means
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;
}
}
}; };
helper.doInTransaction(loadLicenseCallback, false, false);
} }
@Override @Override

5
source/java/org/alfresco/repo/descriptor/DescriptorStartupLog.java
View File

@@ -149,7 +149,8 @@ public class DescriptorStartupLog extends AbstractLifecycleBean
} }
// Log Repository Descriptors // Log Repository Descriptors
if (logger.isInfoEnabled()) // MER - work around for currentRepositoryDescriptor == null
if (logger.isInfoEnabled() && descriptorService.getCurrentRepositoryDescriptor() != null)
{ {
Descriptor serverDescriptor = descriptorService.getServerDescriptor(); Descriptor serverDescriptor = descriptorService.getServerDescriptor();
Descriptor currentDescriptor = descriptorService.getCurrentRepositoryDescriptor(); Descriptor currentDescriptor = descriptorService.getCurrentRepositoryDescriptor();
@@ -176,7 +177,7 @@ public class DescriptorStartupLog extends AbstractLifecycleBean
} }
// Issue a warning if the system is in read-only mode // 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)); logger.warn(I18NUtil.getMessage(SYSTEM_WARN_READONLY));
} }