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 V3.1 to HEAD

Browse Source 
12984: Sharepoint: Build fix after recent change to SiteService and bumped module version to 1.1
   12997: (RECORD ONLY - Already merged) Added home property to start scripts; updated readmes; updated installers
   13140: Merged V3.0 to V3.1
      13138 Merged V2.2 to V3.0
         13133: Fix ETWOTWO-1078: wcm submit does not complete when using Oracle
   13146: Merged V3.0 to V3.1
      13052: CIFS throws a NullPointerException if a non-relative path is received for a folder search. JLAN-69
   13147: Updated svn:mergeinfo
   13151: (RECORD ONLY) Changed labs -> enterprise for distribution bundles
   13157: Partial fix for ETHREEOH-1277 - fixes usage of Application.getMessage()
   ___________________________________________________________________
   Modified: svn:mergeinfo
      Merged /alfresco/BRANCHES/V3.0:r13052,13138
      Merged /alfresco/BRANCHES/V2.2:r13133
      Merged /alfresco/BRANCHES/V3.1:r12984,12997,13140,13146-13147,13151,13154,13157


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@13603 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Derek Hulley
2009-03-12 14:01:59 +00:00
parent 0746698410
commit be54a05c8e
6 changed files with 48 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
source/java/org/alfresco/repo/workflow/jbpm/AlfrescoJobExecutorThread.java
View File

@@ -67,6 +67,10 @@ public class AlfrescoJobExecutorThread extends JobExecutorThread
{
return Collections.EMPTY_LIST;
}
else if (alfrescoJobExecutor.getTransactionService().isReadOnly())
{
return Collections.EMPTY_LIST;
}
return alfrescoJobExecutor.getTransactionService().getRetryingTransactionHelper().doInTransaction(
new RetryingTransactionHelper.RetryingTransactionCallback<Collection>() {
public Collection execute() throws Throwable
@@ -102,6 +106,10 @@ public class AlfrescoJobExecutorThread extends JobExecutorThread
{
return;
}
else if (alfrescoJobExecutor.getTransactionService().isReadOnly())
{
return;
}
alfrescoJobExecutor.getTransactionService().getRetryingTransactionHelper().doInTransaction(new TransactionJob(job));
}
@@ -125,9 +133,6 @@ public class AlfrescoJobExecutorThread extends JobExecutorThread
this.job = job;
}
/* (non-Javadoc)
* @see org.alfresco.repo.transaction.RetryingTransactionHelper.RetryingTransactionCallback#execute()
*/
public Object execute() throws Throwable
{
AlfrescoJobExecutorThread.super.executeJob(job);