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

Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.0/Cloud)

Browse Source 
87778: Merged V4.2-BUG-FIX (4.2.4) to HEAD-BUG-FIX (5.0/Cloud)
      87770: MNT-12257 : Failed to verify license - Possible temporary problem
      Fixed code formatting.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@94553 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alan Davis
2015-01-31 09:49:35 +00:00
parent 285eaa0399
commit 37871c2618
1 changed files with 22 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -389,19 +389,19 @@ public class DescriptorServiceImpl extends AbstractLifecycleBean
{ {
if (currentRepoDescriptor == null) if (currentRepoDescriptor == null)
{ {
final RetryingTransactionHelper txnHelper = transactionService.getRetryingTransactionHelper(); final RetryingTransactionHelper txnHelper = transactionService.getRetryingTransactionHelper();
RetryingTransactionCallback<Void> nopLoadLicense = new RetryingTransactionCallback<Void>() RetryingTransactionCallback<Void> nopLoadLicense = new RetryingTransactionCallback<Void>()
{ {
@Override @Override
public Void execute() public Void execute()
{ {
currentRepoDescriptor = currentRepoDescriptorDAO.updateDescriptor(serverDescriptor, LicenseMode.UNKNOWN); currentRepoDescriptor = currentRepoDescriptorDAO.updateDescriptor(serverDescriptor, LicenseMode.UNKNOWN);
return null; return null;
} }
}; };
txnHelper.doInTransaction(nopLoadLicense, false, false); txnHelper.doInTransaction(nopLoadLicense, false, false);
} }
} }
} }
@@ -750,17 +750,17 @@ public class DescriptorServiceImpl extends AbstractLifecycleBean
// Make sure that the repo descriptor is updated the first time // Make sure that the repo descriptor is updated the first time
if (currentRepoDescriptor == null) if (currentRepoDescriptor == null)
{ {
final RetryingTransactionHelper txnHelper = transactionService.getRetryingTransactionHelper(); final RetryingTransactionHelper txnHelper = transactionService.getRetryingTransactionHelper();
RetryingTransactionCallback<Void> nopLoadLicense = new RetryingTransactionCallback<Void>() RetryingTransactionCallback<Void> nopLoadLicense = new RetryingTransactionCallback<Void>()
{ {
@Override @Override
public Void execute() public Void execute()
{ {
currentRepoDescriptor = currentRepoDescriptorDAO.updateDescriptor(serverDescriptor, LicenseMode.UNKNOWN); currentRepoDescriptor = currentRepoDescriptorDAO.updateDescriptor(serverDescriptor, LicenseMode.UNKNOWN);
return null; return null;
} }
}; };
txnHelper.setForceWritable(true); txnHelper.setForceWritable(true);
txnHelper.doInTransaction(nopLoadLicense, false, false); txnHelper.doInTransaction(nopLoadLicense, false, false);
} }