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 
59123: Merged V4.2-BUG-FIX (4.2.1) to HEAD-BUG-FIX (Cloud/4.3)
      59111: Merged V4.1-BUG-FIX (4.1.8) to V4.2-BUG-FIX (4.2.1)
         59070: Merged DEV to V4.1-BUG-FIX (4.1.8)
            58849: MNT-10096: MT: AbstractTenantRoutingContentStore can return null list of stores
              - Ensure that RetryingTransactionHelper starts a transaction in txn-after-completion phase (MNT-9806).


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62103 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alan Davis
2014-02-12 01:06:17 +00:00
parent 68bfd2b72e
commit 8a8cf1b81a
3 changed files with 67 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
source/test-java/org/alfresco/repo/transaction/RetryingTransactionHelperTest.java
View File

@@ -334,7 +334,7 @@ public class RetryingTransactionHelperTest extends TestCase
/**
* Checks nesting of two transactions with <code>requiresNew == false</code>
*/
public void testNestedWithPropogation()
public void testNestedWithPropagation()
{
RetryingTransactionCallback<Long> callback = new RetryingTransactionCallback<Long>()
{
@@ -362,7 +362,7 @@ public class RetryingTransactionHelperTest extends TestCase
/**
* Checks nesting of two transactions with <code>requiresNew == true</code>
*/
public void testNestedWithoutPropogation()
public void testNestedWithoutPropagation()
{
RetryingTransactionCallback<Long> callback = new RetryingTransactionCallback<Long>()
{
@@ -390,17 +390,18 @@ public class RetryingTransactionHelperTest extends TestCase
/**
* Checks nesting of two transactions with <code>requiresNew == true</code>,
* but where the two transactions get involved in a concurrency struggle.
*
* <p/>
* Note: skip test for non-MySQL
*/
public void testNestedWithoutPropogationConcurrentUntilFailureMySQL() throws InterruptedException
public void testNestedWithoutPropagationConcurrentUntilFailureMySQL() throws InterruptedException
{
final RetryingTransactionHelper txnHelperForTest = transactionService.getRetryingTransactionHelper();
txnHelperForTest.setMaxRetries(1);
if (! (dialect instanceof MySQLInnoDBDialect))
{
// NOOP - skip test for non-MySQL DB dialects to avoid hang if concurrently "nested" (in terms of Spring) since the initial transaction does not complete
// NOOP - skip test for non-MySQL DB dialects to avoid hang if concurrently "nested" (in terms of Spring)
// since the initial transaction does not complete
// see testConcurrencyRetryingNoFailure instead
logger.warn("NOTE: Skipping testNestedWithoutPropogationConcurrentUntilFailureMySQLOnly for dialect: "+dialect);
}
@@ -556,6 +557,7 @@ public class RetryingTransactionHelperTest extends TestCase
assertEquals("Should have been called exactly once", 1, callCount.intValue());
}
@SuppressWarnings({ "unchecked", "rawtypes" })
public void testTimeLimit()
{
final RetryingTransactionHelper txnHelper = new RetryingTransactionHelper();
@@ -617,7 +619,39 @@ public class RetryingTransactionHelperTest extends TestCase
assertEquals("Should have been called tree times", 3, callCount.intValue());
}
public void testStartNewTransaction() throws Exception
{
// MNT-10096
class CustomListenerAdapter extends TransactionListenerAdapter
{
private String newTxnId;
@Override
public void afterRollback()
{
newTxnId = txnHelper.doInTransaction(new RetryingTransactionCallback<String>()
{
@Override
public String execute() throws Throwable
{
return AlfrescoTransactionSupport.getTransactionId();
}
}, true, false);
}
}
UserTransaction txn = transactionService.getUserTransaction();
txn.begin();
String txnId = AlfrescoTransactionSupport.getTransactionId();
CustomListenerAdapter listener = new CustomListenerAdapter();
AlfrescoTransactionSupport.bindListener(listener);
txn.rollback();
assertFalse("New transaction has not started", txnId.equals(listener.newTxnId));
}
private void runThreads(final RetryingTransactionHelper txnHelper, final List<Throwable> caughtExceptions,
Pair<Integer, Integer>... startDurationPairs)
{