Merged BRANCHES/DEV/HEAD-BUG-FIX to HEAD:

54579: ALF-19785: Deadlock during build



git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@54739 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Matt Ward
2013-09-02 07:52:11 +00:00
parent 56f95056c6
commit 6ba121eb00
5 changed files with 67 additions and 5 deletions

View File

@@ -39,6 +39,7 @@ import org.alfresco.error.ExceptionStackUtil;
import org.alfresco.repo.security.permissions.AccessDeniedException;
import org.alfresco.repo.transaction.AlfrescoTransactionSupport.TxnReadState;
import org.alfresco.service.transaction.TransactionService;
import org.alfresco.util.LockHelper.LockTryException;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.ibatis.exceptions.TooManyResultsException;
@@ -105,7 +106,8 @@ public class RetryingTransactionHelper
TooManyResultsException.class, // Expected one result but found multiple (bad key alert)
ObjectNotFoundException.class,
CacheException.class, // Usually a cache replication issue
SQLGrammarException.class // Actually specific to MS SQL Server 2005 - we check for this
SQLGrammarException.class, // Actually specific to MS SQL Server 2005 - we check for this
LockTryException.class
};
List<Class<?>> retryExceptions = new ArrayList<Class<?>>();